diff options
478 files changed, 16253 insertions, 9491 deletions
diff --git a/Android.bp b/Android.bp index cd0720dd2065..eb9cbbb136f9 100644 --- a/Android.bp +++ b/Android.bp @@ -269,7 +269,7 @@ java_defaults { "core/java/android/os/storage/IStorageEventListener.aidl", "core/java/android/os/storage/IStorageShutdownObserver.aidl", "core/java/android/os/storage/IObbActionListener.aidl", - "core/java/android/permission/IRuntimePermissionPresenter.aidl", + "core/java/android/permission/IPermissionController.aidl", "core/java/android/rolecontrollerservice/IRoleControllerService.aidl", ":keystore_aidl", "core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl", diff --git a/CleanSpec.mk b/CleanSpec.mk index d01e183df84d..30c2c69e8572 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -252,6 +252,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/overlay/ExperimentNavigation $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/overlay/ExperimentNavigationBarSlim) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/ExperimentNavigationBarSlim) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ****************************************************************** diff --git a/apct-tests/perftests/autofill/Android.mk b/apct-tests/perftests/autofill/Android.mk index 28555a0d5ca5..f4da40b3175a 100644 --- a/apct-tests/perftests/autofill/Android.mk +++ b/apct-tests/perftests/autofill/Android.mk @@ -22,7 +22,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ androidx.annotation_annotation \ apct-perftests-utils diff --git a/apct-tests/perftests/autofill/AndroidManifest.xml b/apct-tests/perftests/autofill/AndroidManifest.xml index e706a32ad0c8..9c8abc32eb72 100644 --- a/apct-tests/perftests/autofill/AndroidManifest.xml +++ b/apct-tests/perftests/autofill/AndroidManifest.xml @@ -35,6 +35,6 @@ </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.perftests.autofill"/> </manifest> diff --git a/apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java b/apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java index 86a5c109f95a..6979f0f0875d 100644 --- a/apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java +++ b/apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java @@ -16,34 +16,23 @@ package android.view.autofill; +import static org.junit.Assert.assertTrue; + import android.os.Looper; import android.perftests.utils.PerfStatusReporter; import android.perftests.utils.SettingsHelper; import android.perftests.utils.SettingsStateKeeperRule; -import android.perftests.utils.ShellHelper; -import android.view.View; import android.perftests.utils.StubActivity; import android.provider.Settings; -import android.support.test.filters.LargeTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.InstrumentationRegistry; - -import com.android.perftests.autofill.R; -import java.util.Locale; -import java.util.Collection; -import java.util.Arrays; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.rule.ActivityTestRule; -import org.junit.Test; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; -import org.junit.runner.RunWith; - -import static org.junit.Assert.assertTrue; /** * Base class for all autofill tests. diff --git a/apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java b/apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java index 62662e477fd8..80908266c5c0 100644 --- a/apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java +++ b/apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java @@ -16,33 +16,17 @@ package android.view.autofill; -import android.app.Activity; -import android.os.Looper; -import android.os.Bundle; -import android.perftests.utils.PerfStatusReporter; -import android.util.Log; -import android.view.View; -import android.widget.EditText; +import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_HIDDEN; +import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_SHOWN; + import android.perftests.utils.BenchmarkState; import android.perftests.utils.StubActivity; -import android.provider.Settings; -import android.support.test.rule.ActivityTestRule; -import android.support.test.InstrumentationRegistry; -import com.android.perftests.autofill.R; +import android.view.View; +import android.widget.EditText; -import java.util.Locale; -import java.util.Collection; -import java.util.Arrays; +import com.android.perftests.autofill.R; import org.junit.Test; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.runner.RunWith; - -import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_HIDDEN; -import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_SHOWN; public class LoginTest extends AbstractAutofillPerfTestCase { diff --git a/apct-tests/perftests/utils/Android.mk b/apct-tests/perftests/utils/Android.mk index 604f0adbe23e..19f83c8f5bb0 100644 --- a/apct-tests/perftests/utils/Android.mk +++ b/apct-tests/perftests/utils/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ androidx.annotation_annotation # Build all java files in the java subdirectory diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java b/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java index da17818bbda0..93bf541d02b4 100644 --- a/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java +++ b/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java @@ -20,9 +20,10 @@ import android.app.Activity; import android.app.Instrumentation; import android.os.Bundle; import android.os.Debug; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import java.io.File; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/PerfManualStatusReporter.java b/apct-tests/perftests/utils/src/android/perftests/utils/PerfManualStatusReporter.java index 0de6f1d944ff..8187c6fa63d5 100644 --- a/apct-tests/perftests/utils/src/android/perftests/utils/PerfManualStatusReporter.java +++ b/apct-tests/perftests/utils/src/android/perftests/utils/PerfManualStatusReporter.java @@ -16,7 +16,7 @@ package android.perftests.utils; -import android.support.test.InstrumentationRegistry; +import androidx.test.InstrumentationRegistry; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java b/apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java index 4b7b98da442b..d54a85147bf3 100644 --- a/apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java +++ b/apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java @@ -16,16 +16,17 @@ package android.perftests.utils; -import android.support.test.InstrumentationRegistry; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; + import android.util.Log; +import androidx.test.InstrumentationRegistry; + import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - /** * Use this rule to make sure we report the status after the test success. * diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/ShellHelper.java b/apct-tests/perftests/utils/src/android/perftests/utils/ShellHelper.java index 895547df0393..7b52576c1abd 100644 --- a/apct-tests/perftests/utils/src/android/perftests/utils/ShellHelper.java +++ b/apct-tests/perftests/utils/src/android/perftests/utils/ShellHelper.java @@ -17,14 +17,13 @@ package android.perftests.utils; import android.app.UiAutomation; import android.os.ParcelFileDescriptor; -import android.support.test.InstrumentationRegistry; import android.text.TextUtils; import android.util.AndroidRuntimeException; -import android.util.Log; - -import java.io.FileInputStream; import androidx.annotation.NonNull; +import androidx.test.InstrumentationRegistry; + +import java.io.FileInputStream; /** * Provides Shell-based utilities such as running a command. diff --git a/api/current.txt b/api/current.txt index fad607ccefec..b11e6cdaa635 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5385,11 +5385,11 @@ package android.app { method public android.graphics.drawable.Icon getIcon(); method public android.app.RemoteInput[] getRemoteInputs(); method public int getSemanticAction(); + method public boolean isContextual(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.app.Notification.Action> CREATOR; field public static final int SEMANTIC_ACTION_ARCHIVE = 5; // 0x5 field public static final int SEMANTIC_ACTION_CALL = 10; // 0xa - field public static final int SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION = 11; // 0xb field public static final int SEMANTIC_ACTION_DELETE = 4; // 0x4 field public static final int SEMANTIC_ACTION_MARK_AS_READ = 2; // 0x2 field public static final int SEMANTIC_ACTION_MARK_AS_UNREAD = 3; // 0x3 @@ -5414,6 +5414,7 @@ package android.app { method public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Extender); method public android.os.Bundle getExtras(); method public android.app.Notification.Action.Builder setAllowGeneratedReplies(boolean); + method public android.app.Notification.Action.Builder setContextual(boolean); method public android.app.Notification.Action.Builder setSemanticAction(int); } @@ -11598,8 +11599,11 @@ package android.content.pm { field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone"; field public static final java.lang.String FEATURE_MIDI = "android.software.midi"; field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc"; + field public static final java.lang.String FEATURE_NFC_BEAM = "android.sofware.nfc.beam"; field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce"; field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef"; + field public static final java.lang.String FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE = "android.hardware.nfc.ese"; + field public static final java.lang.String FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC = "android.hardware.nfc.uicc"; field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep"; field public static final java.lang.String FEATURE_PC = "android.hardware.type.pc"; field public static final java.lang.String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture"; @@ -24939,6 +24943,25 @@ package android.media { field public static final int TYPE_STRING = 4; // 0x4 } + public final class MediaItem2 implements android.os.Parcelable { + method public int describeContents(); + method public long getEndPosition(); + method public android.media.MediaMetadata getMetadata(); + method public long getStartPosition(); + method public void setMetadata(android.media.MediaMetadata); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.media.MediaItem2> CREATOR; + field public static final long POSITION_UNKNOWN = 576460752303423487L; // 0x7ffffffffffffffL + } + + public static class MediaItem2.Builder { + ctor public MediaItem2.Builder(); + method public android.media.MediaItem2 build(); + method public android.media.MediaItem2.Builder setEndPosition(long); + method public android.media.MediaItem2.Builder setMetadata(android.media.MediaMetadata); + method public android.media.MediaItem2.Builder setStartPosition(long); + } + public final class MediaMetadata implements android.os.Parcelable { method public boolean containsKey(java.lang.String); method public int describeContents(); @@ -29751,7 +29774,10 @@ package android.net.wifi.aware { method public void onIdentityChanged(byte[]); } - public class PeerHandle { + public final class PeerHandle implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.net.wifi.aware.PeerHandle> CREATOR; } public final class PublishConfig implements android.os.Parcelable { @@ -30010,6 +30036,7 @@ package android.net.wifi.p2p { ctor public WifiP2pGroup(android.net.wifi.p2p.WifiP2pGroup); method public int describeContents(); method public java.util.Collection<android.net.wifi.p2p.WifiP2pDevice> getClientList(); + method public int getFrequency(); method public java.lang.String getInterface(); method public java.lang.String getNetworkName(); method public android.net.wifi.p2p.WifiP2pDevice getOwner(); @@ -30286,15 +30313,16 @@ package android.nfc { method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage); method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle); method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context); + method public java.util.List<java.lang.String> getSupportedOffHostSecureElements(); method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler); - method public boolean invokeBeam(android.app.Activity); + method public deprecated boolean invokeBeam(android.app.Activity); method public boolean isEnabled(); - method public boolean isNdefPushEnabled(); - method public void setBeamPushUris(android.net.Uri[], android.app.Activity); - method public void setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity); - method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...); - method public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...); - method public void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...); + method public deprecated boolean isNdefPushEnabled(); + method public deprecated void setBeamPushUris(android.net.Uri[], android.app.Activity); + method public deprecated void setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity); + method public deprecated void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...); + method public deprecated void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...); + method public deprecated void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...); field public static final java.lang.String ACTION_ADAPTER_STATE_CHANGED = "android.nfc.action.ADAPTER_STATE_CHANGED"; field public static final java.lang.String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED"; field public static final java.lang.String ACTION_TAG_DISCOVERED = "android.nfc.action.TAG_DISCOVERED"; @@ -30321,15 +30349,15 @@ package android.nfc { field public static final int STATE_TURNING_ON = 2; // 0x2 } - public static abstract interface NfcAdapter.CreateBeamUrisCallback { + public static abstract deprecated interface NfcAdapter.CreateBeamUrisCallback { method public abstract android.net.Uri[] createBeamUris(android.nfc.NfcEvent); } - public static abstract interface NfcAdapter.CreateNdefMessageCallback { + public static abstract deprecated interface NfcAdapter.CreateNdefMessageCallback { method public abstract android.nfc.NdefMessage createNdefMessage(android.nfc.NfcEvent); } - public static abstract interface NfcAdapter.OnNdefPushCompleteCallback { + public static abstract deprecated interface NfcAdapter.OnNdefPushCompleteCallback { method public abstract void onNdefPushComplete(android.nfc.NfcEvent); } @@ -30377,8 +30405,10 @@ package android.nfc.cardemulation { method public boolean isDefaultServiceForCategory(android.content.ComponentName, java.lang.String); method public boolean registerAidsForService(android.content.ComponentName, java.lang.String, java.util.List<java.lang.String>); method public boolean removeAidsForService(android.content.ComponentName, java.lang.String); + method public boolean setOffHostForService(android.content.ComponentName, java.lang.String); method public boolean setPreferredService(android.app.Activity, android.content.ComponentName); method public boolean supportsAidPrefixRegistration(); + method public boolean unsetOffHostForService(android.content.ComponentName); method public boolean unsetPreferredService(android.app.Activity); field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT"; field public static final java.lang.String CATEGORY_OTHER = "other"; @@ -37855,7 +37885,11 @@ package android.provider { method public static java.lang.String getVolumeName(android.net.Uri); method public static android.provider.MediaStore.PendingSession openPending(android.content.Context, android.net.Uri); method public static android.net.Uri setIncludePending(android.net.Uri); + method public static android.net.Uri setIncludeTrashed(android.net.Uri); method public static android.net.Uri setRequireOriginal(android.net.Uri); + method public static void trash(android.content.Context, android.net.Uri); + method public static void trash(android.content.Context, android.net.Uri, long); + method public static void untrash(android.content.Context, android.net.Uri); field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE"; field public static final java.lang.String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE"; field public static final java.lang.String ACTION_REVIEW = "android.provider.action.REVIEW"; @@ -38034,6 +38068,7 @@ package android.provider { } public static abstract interface MediaStore.DownloadColumns implements android.provider.MediaStore.MediaColumns { + field public static final java.lang.String DESCRIPTION = "description"; field public static final java.lang.String DOWNLOAD_URI = "download_uri"; field public static final java.lang.String REFERER_URI = "referer_uri"; } @@ -38078,6 +38113,7 @@ package android.provider { field public static final deprecated java.lang.String MINI_THUMB_MAGIC = "mini_thumb_magic"; field public static final java.lang.String ORIENTATION = "orientation"; field public static final deprecated java.lang.String PICASA_ID = "picasa_id"; + field public static final java.lang.String SECONDARY_BUCKET_ID = "secondary_bucket_id"; } public static final class MediaStore.Images.Media implements android.provider.MediaStore.Images.ImageColumns { @@ -38122,11 +38158,13 @@ package android.provider { public static abstract interface MediaStore.MediaColumns implements android.provider.BaseColumns { field public static final deprecated java.lang.String DATA = "_data"; field public static final java.lang.String DATE_ADDED = "date_added"; + field public static final java.lang.String DATE_EXPIRES = "date_expires"; field public static final java.lang.String DATE_MODIFIED = "date_modified"; field public static final java.lang.String DISPLAY_NAME = "_display_name"; field public static final java.lang.String HASH = "_hash"; field public static final java.lang.String HEIGHT = "height"; field public static final java.lang.String IS_PENDING = "is_pending"; + field public static final java.lang.String IS_TRASHED = "is_trashed"; field public static final java.lang.String MIME_TYPE = "mime_type"; field public static final java.lang.String OWNER_PACKAGE_NAME = "owner_package_name"; field public static final java.lang.String SIZE = "_size"; @@ -38202,6 +38240,7 @@ package android.provider { field public static final deprecated java.lang.String LONGITUDE = "longitude"; field public static final deprecated java.lang.String MINI_THUMB_MAGIC = "mini_thumb_magic"; field public static final java.lang.String RESOLUTION = "resolution"; + field public static final java.lang.String SECONDARY_BUCKET_ID = "secondary_bucket_id"; field public static final java.lang.String TAGS = "tags"; } diff --git a/api/system-current.txt b/api/system-current.txt index e27c29f657eb..e99ac06c258e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -62,6 +62,7 @@ package android { field public static final java.lang.String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES"; field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS"; field public static final java.lang.String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE"; + field public static final java.lang.String GET_RUNTIME_PERMISSIONS = "android.permission.GET_RUNTIME_PERMISSIONS"; field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO"; field public static final java.lang.String GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS = "android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS"; field public static final java.lang.String GRANT_RUNTIME_PERMISSIONS = "android.permission.GRANT_RUNTIME_PERMISSIONS"; @@ -94,6 +95,7 @@ package android { field public static final java.lang.String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS"; field public static final java.lang.String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS"; field public static final java.lang.String MANAGE_ROLE_HOLDERS = "android.permission.MANAGE_ROLE_HOLDERS"; + field public static final java.lang.String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS"; field public static final java.lang.String MANAGE_SENSOR_PRIVACY = "android.permission.MANAGE_SENSOR_PRIVACY"; field public static final java.lang.String MANAGE_SOUND_TRIGGER = "android.permission.MANAGE_SOUND_TRIGGER"; field public static final java.lang.String MANAGE_SUBSCRIPTION_PLANS = "android.permission.MANAGE_SUBSCRIPTION_PLANS"; @@ -1038,6 +1040,7 @@ package android.content { field public static final java.lang.String OEM_LOCK_SERVICE = "oem_lock"; field public static final java.lang.String PERMISSION_SERVICE = "permission"; field public static final java.lang.String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block"; + field public static final java.lang.String ROLLBACK_SERVICE = "rollback"; field public static final java.lang.String SECURE_ELEMENT_SERVICE = "secure_element"; field public static final java.lang.String STATS_MANAGER = "stats"; field public static final java.lang.String SYSTEM_UPDATE_SERVICE = "system_update"; @@ -1069,6 +1072,7 @@ package android.content { field public static final java.lang.String ACTION_MANAGE_PERMISSIONS = "android.intent.action.MANAGE_PERMISSIONS"; field public static final java.lang.String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS"; field public static final java.lang.String ACTION_MASTER_CLEAR_NOTIFICATION = "android.intent.action.MASTER_CLEAR_NOTIFICATION"; + field public static final java.lang.String ACTION_PACKAGE_ROLLBACK_EXECUTED = "android.intent.action.PACKAGE_ROLLBACK_EXECUTED"; field public static final java.lang.String ACTION_PRE_BOOT_COMPLETED = "android.intent.action.PRE_BOOT_COMPLETED"; field public static final java.lang.String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART"; field public static final java.lang.String ACTION_RESOLVE_INSTANT_APP_PACKAGE = "android.intent.action.RESOLVE_INSTANT_APP_PACKAGE"; @@ -1204,6 +1208,7 @@ package android.content.pm { method public void setAllocateAggressive(boolean); method public void setAllowDowngrade(boolean); method public void setDontKillApp(boolean); + method public void setEnableRollback(); method public void setGrantedRuntimePermissions(java.lang.String[]); method public void setInstallAsInstantApp(boolean); method public void setInstallAsVirtualPreload(); @@ -1398,6 +1403,41 @@ package android.content.pm.permission { } +package android.content.rollback { + + public final class PackageRollbackInfo implements android.os.Parcelable { + ctor public PackageRollbackInfo(java.lang.String, android.content.rollback.PackageRollbackInfo.PackageVersion, android.content.rollback.PackageRollbackInfo.PackageVersion); + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.content.rollback.PackageRollbackInfo> CREATOR; + field public final android.content.rollback.PackageRollbackInfo.PackageVersion higherVersion; + field public final android.content.rollback.PackageRollbackInfo.PackageVersion lowerVersion; + field public final java.lang.String packageName; + } + + public static class PackageRollbackInfo.PackageVersion { + ctor public PackageRollbackInfo.PackageVersion(long); + field public final long versionCode; + } + + public final class RollbackInfo implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.content.rollback.RollbackInfo> CREATOR; + field public final android.content.rollback.PackageRollbackInfo targetPackage; + } + + public final class RollbackManager { + method public void executeRollback(android.content.rollback.RollbackInfo, android.content.IntentSender); + method public void expireRollbackForPackage(java.lang.String); + method public android.content.rollback.RollbackInfo getAvailableRollback(java.lang.String); + method public java.util.List<java.lang.String> getPackagesWithAvailableRollbacks(); + method public java.util.List<android.content.rollback.RollbackInfo> getRecentlyExecutedRollbacks(); + method public void reloadPersistedData(); + } + +} + package android.hardware { public final class Sensor { @@ -1472,8 +1512,6 @@ package android.hardware.display { public final class BrightnessConfiguration implements android.os.Parcelable { method public int describeContents(); - method public android.hardware.display.BrightnessCorrection getCorrectionByCategory(int); - method public android.hardware.display.BrightnessCorrection getCorrectionByPackageName(java.lang.String); method public android.util.Pair<float[], float[]> getCurve(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessConfiguration> CREATOR; @@ -1481,22 +1519,10 @@ package android.hardware.display { public static class BrightnessConfiguration.Builder { ctor public BrightnessConfiguration.Builder(float[], float[]); - method public android.hardware.display.BrightnessConfiguration.Builder addCorrectionByCategory(int, android.hardware.display.BrightnessCorrection); - method public android.hardware.display.BrightnessConfiguration.Builder addCorrectionByPackageName(java.lang.String, android.hardware.display.BrightnessCorrection); method public android.hardware.display.BrightnessConfiguration build(); - method public int getMaxCorrectionsByCategory(); - method public int getMaxCorrectionsByPackageName(); method public android.hardware.display.BrightnessConfiguration.Builder setDescription(java.lang.String); } - public final class BrightnessCorrection implements android.os.Parcelable { - method public float apply(float); - method public static android.hardware.display.BrightnessCorrection createScaleAndTranslateLog(float, float); - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessCorrection> CREATOR; - } - public final class DisplayManager { method public java.util.List<android.hardware.display.AmbientBrightnessDayStats> getAmbientBrightnessStats(); method public android.hardware.display.BrightnessConfiguration getBrightnessConfiguration(); @@ -3163,34 +3189,6 @@ package android.media.audiopolicy { package android.media.session { - public final class ControllerCallbackLink implements android.os.Parcelable { - ctor public ControllerCallbackLink(android.media.session.ControllerCallbackLink.CallbackStub); - method public int describeContents(); - method public android.os.IBinder getBinder(); - method public void notifyEvent(java.lang.String, android.os.Bundle); - method public void notifyExtrasChanged(android.os.Bundle); - method public void notifyMetadataChanged(android.media.MediaMetadata); - method public void notifyPlaybackStateChanged(android.media.session.PlaybackState); - method public void notifyQueueChanged(java.util.List<android.media.session.MediaSession.QueueItem>); - method public void notifyQueueTitleChanged(java.lang.CharSequence); - method public void notifySessionDestroyed(); - method public void notifyVolumeInfoChanged(int, android.media.AudioAttributes, int, int, int); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.media.session.ControllerCallbackLink> CREATOR; - } - - public static abstract class ControllerCallbackLink.CallbackStub { - ctor public ControllerCallbackLink.CallbackStub(); - method public void onEvent(java.lang.String, android.os.Bundle); - method public void onExtrasChanged(android.os.Bundle); - method public void onMetadataChanged(android.media.MediaMetadata); - method public void onPlaybackStateChanged(android.media.session.PlaybackState); - method public void onQueueChanged(java.util.List<android.media.session.MediaSession.QueueItem>); - method public void onQueueTitleChanged(java.lang.CharSequence); - method public void onSessionDestroyed(); - method public void onVolumeInfoChanged(int, android.media.AudioAttributes, int, int, int); - } - public final class MediaSessionManager { method public void setOnMediaKeyListener(android.media.session.MediaSessionManager.OnMediaKeyListener, android.os.Handler); method public void setOnVolumeKeyLongPressListener(android.media.session.MediaSessionManager.OnVolumeKeyLongPressListener, android.os.Handler); @@ -3204,64 +3202,6 @@ package android.media.session { method public abstract void onVolumeKeyLongPress(android.view.KeyEvent); } - public final class SessionCallbackLink implements android.os.Parcelable { - ctor public SessionCallbackLink(android.media.session.SessionCallbackLink.CallbackStub); - method public int describeContents(); - method public android.os.IBinder getBinder(); - method public void notifyAdjustVolume(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int); - method public void notifyCommand(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle, android.os.ResultReceiver); - method public void notifyCustomAction(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void notifyFastForward(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void notifyMediaButton(java.lang.String, int, int, android.content.Intent, int, android.os.ResultReceiver); - method public void notifyMediaButtonFromController(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.content.Intent); - method public void notifyNext(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void notifyPause(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void notifyPlay(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void notifyPlayFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void notifyPlayFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void notifyPlayFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle); - method public void notifyPrepare(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void notifyPrepareFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void notifyPrepareFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void notifyPrepareFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle); - method public void notifyPrevious(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void notifyRate(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.media.Rating); - method public void notifyRewind(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void notifySeekTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long); - method public void notifySetVolumeTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int); - method public void notifySkipToTrack(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long); - method public void notifyStop(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.media.session.SessionCallbackLink> CREATOR; - } - - public static abstract class SessionCallbackLink.CallbackStub { - ctor public SessionCallbackLink.CallbackStub(); - method public void onAdjustVolume(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int); - method public void onCommand(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle, android.os.ResultReceiver); - method public void onCustomAction(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void onFastForward(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void onMediaButton(java.lang.String, int, int, android.content.Intent, int, android.os.ResultReceiver); - method public void onMediaButtonFromController(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.content.Intent); - method public void onNext(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void onPause(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void onPlay(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void onPlayFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void onPlayFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void onPlayFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle); - method public void onPrepare(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void onPrepareFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void onPrepareFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle); - method public void onPrepareFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle); - method public void onPrevious(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void onRate(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.media.Rating); - method public void onRewind(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - method public void onSeekTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long); - method public void onSetVolumeTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int); - method public void onSkipToTrack(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long); - method public void onStop(java.lang.String, int, int, android.media.session.ControllerCallbackLink); - } - } package android.media.soundtrigger { @@ -3955,7 +3895,6 @@ package android.net.wifi { method public void disable(int, android.net.wifi.WifiManager.ActionListener); method public void disableEphemeralNetwork(java.lang.String); method public void forget(int, android.net.wifi.WifiManager.ActionListener); - method public java.util.List<android.net.wifi.WifiConfiguration> getAllMatchingWifiConfigs(java.util.List<android.net.wifi.ScanResult>); method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks(); method public android.net.wifi.WifiConfiguration getWifiApConfiguration(); method public int getWifiApState(); @@ -4648,6 +4587,7 @@ package android.os.storage { method public void allocateBytes(java.util.UUID, long, int) throws java.io.IOException; method public void allocateBytes(java.io.FileDescriptor, long, int) throws java.io.IOException; method public long getAllocatableBytes(java.util.UUID, int) throws java.io.IOException; + method public static boolean hasIsolatedStorage(); field public static final int FLAG_ALLOCATE_AGGRESSIVE = 1; // 0x1 } @@ -4655,6 +4595,16 @@ package android.os.storage { package android.permission { + public abstract class PermissionControllerService extends android.app.Service { + ctor public PermissionControllerService(); + method public final void attachBaseContext(android.content.Context); + method public final android.os.IBinder onBind(android.content.Intent); + method public abstract int onCountPermissionApps(java.util.List<java.lang.String>, boolean, boolean); + method public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(java.lang.String); + method public abstract void onRevokeRuntimePermission(java.lang.String, java.lang.String); + field public static final java.lang.String SERVICE_INTERFACE = "android.permission.PermissionControllerService"; + } + public final class PermissionManager { method public java.util.List<android.permission.PermissionManager.SplitPermissionInfo> getSplitPermissions(); } @@ -4675,16 +4625,6 @@ package android.permission { field public static final android.os.Parcelable.Creator<android.permission.RuntimePermissionPresentationInfo> CREATOR; } - public abstract class RuntimePermissionPresenterService extends android.app.Service { - ctor public RuntimePermissionPresenterService(); - method public final void attachBaseContext(android.content.Context); - method public final android.os.IBinder onBind(android.content.Intent); - method public abstract int onCountPermissionApps(java.util.List<java.lang.String>, boolean, boolean); - method public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(java.lang.String); - method public abstract void onRevokeRuntimePermission(java.lang.String, java.lang.String); - field public static final java.lang.String SERVICE_INTERFACE = "android.permission.RuntimePermissionPresenterService"; - } - } package android.permissionpresenterservice { @@ -7983,6 +7923,7 @@ package android.webkit { method public void callDrawGlFunction(android.graphics.Canvas, long, java.lang.Runnable); method public boolean canInvokeDrawGlFunctor(android.view.View); method public void detachDrawGlFunctor(android.view.View, long); + method public void drawWebViewFunctor(android.graphics.Canvas, int); method public android.app.Application getApplication(); method public java.lang.String getDataDirectorySuffix(); method public java.lang.String getErrorString(android.content.Context, int); diff --git a/api/test-current.txt b/api/test-current.txt index 9c51c9fe84e0..1401cbb4211e 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -330,11 +330,6 @@ package android.content { method public android.os.UserHandle getUser(); method public int getUserId(); method public void setAutofillCompatibilityEnabled(boolean); - field public static final java.lang.String ROLLBACK_SERVICE = "rollback"; - } - - public class Intent implements java.lang.Cloneable android.os.Parcelable { - field public static final java.lang.String ACTION_PACKAGE_ROLLBACK_EXECUTED = "android.intent.action.PACKAGE_ROLLBACK_EXECUTED"; } } @@ -357,10 +352,6 @@ package android.content.pm { ctor public LauncherApps(android.content.Context); } - public static class PackageInstaller.SessionParams implements android.os.Parcelable { - method public void setEnableRollback(); - } - public abstract class PackageManager { method public abstract boolean arePermissionsIndividuallyControlled(); method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int); @@ -408,42 +399,6 @@ package android.content.res { } -package android.content.rollback { - - public final class PackageRollbackInfo implements android.os.Parcelable { - ctor public PackageRollbackInfo(java.lang.String, android.content.rollback.PackageRollbackInfo.PackageVersion, android.content.rollback.PackageRollbackInfo.PackageVersion); - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.content.rollback.PackageRollbackInfo> CREATOR; - field public final android.content.rollback.PackageRollbackInfo.PackageVersion higherVersion; - field public final android.content.rollback.PackageRollbackInfo.PackageVersion lowerVersion; - field public final java.lang.String packageName; - } - - public static class PackageRollbackInfo.PackageVersion { - ctor public PackageRollbackInfo.PackageVersion(long); - field public final long versionCode; - } - - public final class RollbackInfo implements android.os.Parcelable { - ctor public RollbackInfo(android.content.rollback.PackageRollbackInfo); - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.content.rollback.RollbackInfo> CREATOR; - field public final android.content.rollback.PackageRollbackInfo targetPackage; - } - - public final class RollbackManager { - method public void executeRollback(android.content.rollback.RollbackInfo, android.content.IntentSender); - method public void expireRollbackForPackage(java.lang.String); - method public android.content.rollback.RollbackInfo getAvailableRollback(java.lang.String); - method public java.util.List<java.lang.String> getPackagesWithAvailableRollbacks(); - method public java.util.List<android.content.rollback.RollbackInfo> getRecentlyExecutedRollbacks(); - method public void reloadPersistedData(); - } - -} - package android.database.sqlite { public class SQLiteCompatibilityWalFlags { diff --git a/cmds/media/src/com/android/commands/media/Media.java b/cmds/media/src/com/android/commands/media/Media.java index ded20c4b38bf..c6d2bc891b18 100644 --- a/cmds/media/src/com/android/commands/media/Media.java +++ b/cmds/media/src/com/android/commands/media/Media.java @@ -19,12 +19,12 @@ package com.android.commands.media; import android.app.ActivityManager; import android.content.Context; -import android.media.AudioAttributes; +import android.content.pm.ParceledListSlice; import android.media.MediaMetadata; -import android.media.session.ControllerCallbackLink; import android.media.session.ISessionController; +import android.media.session.ISessionControllerCallback; import android.media.session.ISessionManager; -import android.media.session.MediaSession.QueueItem; +import android.media.session.ParcelableVolumeInfo; import android.media.session.PlaybackState; import android.os.Bundle; import android.os.HandlerThread; @@ -178,7 +178,13 @@ public class Media extends BaseCommand { KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD)); } - class ControllerCallbackStub extends ControllerCallbackLink.CallbackStub { + class ControllerMonitor extends ISessionControllerCallback.Stub { + private final ISessionController mController; + + public ControllerMonitor(ISessionController controller) { + mController = controller; + } + @Override public void onSessionDestroyed() { System.out.println("onSessionDestroyed. Enter q to quit."); @@ -202,37 +208,24 @@ public class Media extends BaseCommand { } @Override - public void onQueueChanged(List<QueueItem> queue) { + public void onQueueChanged(ParceledListSlice queue) throws RemoteException { System.out.println("onQueueChanged, " - + (queue == null ? "null queue" : " size=" + queue.size())); + + (queue == null ? "null queue" : " size=" + queue.getList().size())); } @Override - public void onQueueTitleChanged(CharSequence title) { + public void onQueueTitleChanged(CharSequence title) throws RemoteException { System.out.println("onQueueTitleChange " + title); } @Override - public void onExtrasChanged(Bundle extras) { + public void onExtrasChanged(Bundle extras) throws RemoteException { System.out.println("onExtrasChanged " + extras); } @Override - public void onVolumeInfoChanged(int volumeType, AudioAttributes attrs, int controlType, - int maxVolume, int currentVolume) { - System.out.println("onVolumeInfoChanged " + "volumeType=" + volumeType + ", attrs=" - + attrs + ", controlType=" + controlType + ", maxVolume=" + maxVolume - + ", currentVolume=" + currentVolume); - } - } - - private class ControllerMonitor { - private final ISessionController mController; - private final ControllerCallbackLink mControllerCallbackLink; - - ControllerMonitor(ISessionController controller) { - mController = controller; - mControllerCallbackLink = new ControllerCallbackLink(new ControllerCallbackStub()); + public void onVolumeInfoChanged(ParcelableVolumeInfo info) throws RemoteException { + System.out.println("onVolumeInfoChanged " + info); } void printUsageMessage() { @@ -251,7 +244,7 @@ public class Media extends BaseCommand { @Override protected void onLooperPrepared() { try { - mController.registerCallbackListener(PACKAGE_NAME, mControllerCallbackLink); + mController.registerCallbackListener(PACKAGE_NAME, ControllerMonitor.this); } catch (RemoteException e) { System.out.println("Error registering monitor callback"); } @@ -294,7 +287,7 @@ public class Media extends BaseCommand { } finally { cbThread.getLooper().quit(); try { - mController.unregisterCallbackListener(mControllerCallbackLink); + mController.unregisterCallbackListener(this); } catch (Exception e) { // ignoring } diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index f0b751db5ae9..59b2aa6ac3d1 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -136,7 +136,7 @@ cc_defaults { "android.hardware.power@1.0", "android.hardware.power@1.1", "android.hardware.power.stats@1.0", - "android.hardware.thermal@1.0", + "android.hardware.thermal@2.0", "libpackagelistparser", "libsysutils", "libcutils", @@ -332,6 +332,8 @@ java_library { "src/stats_log.proto", "src/statsd_config.proto", "src/atoms.proto", + "src/shell/shell_config.proto", + "src/shell/shell_data.proto", ], static_libs: [ diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index f2a46636c382..3107b4dd7fce 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -360,7 +360,11 @@ status_t StatsService::command(int in, int out, int err, Vector<String8>& args, if (mShellSubscriber == nullptr) { mShellSubscriber = new ShellSubscriber(mUidMap, mPullerManager); } - mShellSubscriber->startNewSubscription(in, out, resultReceiver); + int timeoutSec = -1; + if (argCount >= 2) { + timeoutSec = atoi(args[1].c_str()); + } + mShellSubscriber->startNewSubscription(in, out, resultReceiver, timeoutSec); return NO_ERROR; } } diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index e5415430d82a..5c53a3a585f8 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -2789,13 +2789,14 @@ message BatteryLevel { * frameworks/base/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp */ message Temperature { - // The type of temperature being reported. Eg. CPU, GPU, SKIN, BATTERY. + // The type of temperature being reported. Eg. CPU, GPU, SKIN, BATTERY, BCL_. optional android.os.TemperatureTypeEnum sensor_location = 1; // The name of the temperature source. Eg. CPU0 optional string sensor_name = 2; // Temperature in tenths of a degree C. + // For BCL, it is decimillivolt, decimilliamps, and percentage * 10. optional int32 temperature_deci_celsius = 3; } diff --git a/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp b/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp index 33a17deabc5a..53709f14564d 100644 --- a/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp +++ b/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp @@ -17,7 +17,7 @@ #define DEBUG false // STOPSHIP if true #include "Log.h" -#include <android/hardware/thermal/1.0/IThermal.h> +#include <android/hardware/thermal/2.0/IThermal.h> #include "external/ResourceThermalManagerPuller.h" #include "external/StatsPuller.h" @@ -31,10 +31,11 @@ using android::hardware::hidl_death_recipient; using android::hardware::hidl_vec; using android::hidl::base::V1_0::IBase; -using android::hardware::thermal::V1_0::IThermal; -using android::hardware::thermal::V1_0::Temperature; -using android::hardware::thermal::V1_0::ThermalStatus; -using android::hardware::thermal::V1_0::ThermalStatusCode; +using ::android::hardware::thermal::V2_0::IThermal; +using ::android::hardware::thermal::V2_0::Temperature; +using ::android::hardware::thermal::V2_0::TemperatureType; +using ::android::hardware::thermal::V1_0::ThermalStatus; +using ::android::hardware::thermal::V1_0::ThermalStatusCode; using android::hardware::Return; using android::hardware::Void; @@ -49,7 +50,7 @@ namespace os { namespace statsd { bool getThermalHalLocked(); -sp<android::hardware::thermal::V1_0::IThermal> gThermalHal = nullptr; +sp<android::hardware::thermal::V2_0::IThermal> gThermalHal = nullptr; std::mutex gThermalHalMutex; struct ThermalHalDeathRecipient : virtual public hidl_death_recipient { @@ -107,7 +108,7 @@ bool ResourceThermalManagerPuller::PullInternal(vector<shared_ptr<LogEvent>>* da data->clear(); bool resultSuccess = true; - Return<void> ret = gThermalHal->getTemperatures( + Return<void> ret = gThermalHal->getCurrentTemperatures(false, TemperatureType::SKIN, [&](ThermalStatus status, const hidl_vec<Temperature>& temps) { if (status.code != ThermalStatusCode::SUCCESS) { ALOGE("Failed to get temperatures from ThermalHAL. Status: %d", status.code); @@ -121,7 +122,7 @@ bool ResourceThermalManagerPuller::PullInternal(vector<shared_ptr<LogEvent>>* da ptr->write((static_cast<int>(temps[i].type))); ptr->write(temps[i].name); // Convert the temperature to an int. - int32_t temp = static_cast<int>(temps[i].currentValue * 10); + int32_t temp = static_cast<int>(temps[i].value * 10); ptr->write(temp); ptr->init(); data->push_back(ptr); diff --git a/cmds/statsd/src/shell/ShellSubscriber.cpp b/cmds/statsd/src/shell/ShellSubscriber.cpp index 22883f3c205a..52d5ffc33317 100644 --- a/cmds/statsd/src/shell/ShellSubscriber.cpp +++ b/cmds/statsd/src/shell/ShellSubscriber.cpp @@ -30,7 +30,8 @@ namespace statsd { const static int FIELD_ID_ATOM = 1; -void ShellSubscriber::startNewSubscription(int in, int out, sp<IResultReceiver> resultReceiver) { +void ShellSubscriber::startNewSubscription(int in, int out, sp<IResultReceiver> resultReceiver, + int timeoutSec) { VLOG("start new shell subscription"); { std::lock_guard<std::mutex> lock(mMutex); @@ -50,11 +51,18 @@ void ShellSubscriber::startNewSubscription(int in, int out, sp<IResultReceiver> // Read config forever until EOF is reached. Clients may send multiple configs -- each new // config replace the previous one. readConfig(in); + VLOG("timeout : %d", timeoutSec); // Now we have read an EOF we now wait for the semaphore until the client exits. VLOG("Now wait for client to exit"); std::unique_lock<std::mutex> lk(mMutex); - mShellDied.wait(lk, [this, resultReceiver] { return mResultReceiver != resultReceiver; }); + + if (timeoutSec > 0) { + mShellDied.wait_for(lk, timeoutSec * 1s, + [this, resultReceiver] { return mResultReceiver != resultReceiver; }); + } else { + mShellDied.wait(lk, [this, resultReceiver] { return mResultReceiver != resultReceiver; }); + } } void ShellSubscriber::updateConfig(const ShellSubscription& config) { diff --git a/cmds/statsd/src/shell/ShellSubscriber.h b/cmds/statsd/src/shell/ShellSubscriber.h index 5401f31ce68c..8e54a8b00091 100644 --- a/cmds/statsd/src/shell/ShellSubscriber.h +++ b/cmds/statsd/src/shell/ShellSubscriber.h @@ -65,7 +65,8 @@ public: /** * Start a new subscription. */ - void startNewSubscription(int inFd, int outFd, sp<IResultReceiver> resultReceiver); + void startNewSubscription(int inFd, int outFd, sp<IResultReceiver> resultReceiver, + int timeoutSec); void binderDied(const wp<IBinder>& who); diff --git a/cmds/statsd/tests/shell/ShellSubscriber_test.cpp b/cmds/statsd/tests/shell/ShellSubscriber_test.cpp index a184f5672d65..73d1fd7850e9 100644 --- a/cmds/statsd/tests/shell/ShellSubscriber_test.cpp +++ b/cmds/statsd/tests/shell/ShellSubscriber_test.cpp @@ -83,7 +83,7 @@ void runShellTest(ShellSubscription config, sp<MockUidMap> uidMap, // mimic a binder thread that a shell subscriber runs on. it would block. std::thread reader([&resultReceiver, &fds_config, &fds_data, &shellClient] { - shellClient->startNewSubscription(fds_config[0], fds_data[1], resultReceiver); + shellClient->startNewSubscription(fds_config[0], fds_data[1], resultReceiver, -1); }); reader.detach(); diff --git a/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java b/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java index 0775afeaeda4..de818a8fd77d 100644 --- a/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java +++ b/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java @@ -54,7 +54,8 @@ public class TestDrive { "AID_SYSTEM", "AID_ROOT", "AID_BLUETOOTH", - "AID_LMKD" + "AID_LMKD", + "com.android.managedprovisioning" }; private static final Logger LOGGER = Logger.getLogger(TestDrive.class.getName()); diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt index 7a993fd946f7..041fbfaff23d 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-greylist.txt @@ -2837,8 +2837,6 @@ Lcom/android/internal/telephony/dataconnection/DcTracker;->mProvisioningSpinner: Lcom/android/internal/telephony/dataconnection/DcTracker;->mResolver:Landroid/content/ContentResolver; Lcom/android/internal/telephony/dataconnection/DcTracker;->mState:Lcom/android/internal/telephony/DctConstants$State; Lcom/android/internal/telephony/dataconnection/DcTracker;->mSubscriptionManager:Landroid/telephony/SubscriptionManager; -Lcom/android/internal/telephony/dataconnection/DcTracker;->notifyDataConnection(Ljava/lang/String;)V -Lcom/android/internal/telephony/dataconnection/DcTracker;->notifyOffApnsOfAvailability(Ljava/lang/String;)V Lcom/android/internal/telephony/dataconnection/DcTracker;->onActionIntentDataStallAlarm(Landroid/content/Intent;)V Lcom/android/internal/telephony/dataconnection/DcTracker;->onActionIntentProvisioningApnAlarm(Landroid/content/Intent;)V Lcom/android/internal/telephony/dataconnection/DcTracker;->onRecordsLoadedOrSubIdChanged()V @@ -3290,7 +3288,7 @@ Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/o Lcom/android/internal/telephony/ITelephonyRegistry;->listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallState(ILjava/lang/String;)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellInfo(Ljava/util/List;)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V +Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;)V Lcom/android/internal/telephony/IWapPushManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IWapPushManager; Lcom/android/internal/telephony/IWapPushManager;->addPackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZ)Z Lcom/android/internal/telephony/IWapPushManager;->deletePackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 997ed25a42c6..e86fa8935469 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -19,6 +19,7 @@ package android.accessibilityservice; import static android.content.pm.PackageManager.FEATURE_FINGERPRINT; import android.annotation.IntDef; +import android.annotation.IntRange; import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; @@ -794,7 +795,7 @@ public class AccessibilityServiceInfo implements Parcelable { * * @see android.R.styleable#AccessibilityService_nonInteractiveUiTimeout */ - public void setNonInteractiveUiTimeoutMillis(int timeout) { + public void setNonInteractiveUiTimeoutMillis(@IntRange(from = 0) int timeout) { mNonInteractiveUiTimeout = timeout; } @@ -821,7 +822,7 @@ public class AccessibilityServiceInfo implements Parcelable { * * @see android.R.styleable#AccessibilityService_interactiveUiTimeout */ - public void setInteractiveUiTimeoutMillis(int timeout) { + public void setInteractiveUiTimeoutMillis(@IntRange(from = 0) int timeout) { mInteractiveUiTimeout = timeout; } diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index b42d53ad10f6..0b509169010c 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -73,6 +73,12 @@ public abstract class ActivityManagerInternal { IBinder whitelistToken, long duration); /** + * Allows for a {@link PendingIntent} to be whitelisted to start activities from background. + */ + public abstract void setPendingIntentAllowBgActivityStarts( + IIntentSender target, IBinder whitelistToken, int flags); + + /** * Allow DeviceIdleController to tell us about what apps are whitelisted. */ public abstract void setDeviceIdleWhitelist(int[] allAppids, int[] exceptIdleAppids); @@ -250,7 +256,7 @@ public abstract class ActivityManagerInternal { public abstract int broadcastIntentInPackage(String packageName, int uid, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras, String requiredPermission, Bundle bOptions, boolean serialized, - boolean sticky, int userId); + boolean sticky, int userId, boolean allowBackgroundActivityStarts); public abstract ComponentName startServiceInPackage(int uid, Intent service, String resolvedType, boolean fgRequired, String callingPackage, int userId) throws TransactionTooLargeException; diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java index f64e0671f459..57132a72700d 100644 --- a/core/java/android/app/ActivityView.java +++ b/core/java/android/app/ActivityView.java @@ -37,6 +37,7 @@ import android.view.SurfaceControl; import android.view.SurfaceHolder; import android.view.SurfaceSession; import android.view.SurfaceView; +import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; import android.view.WindowManagerGlobal; @@ -354,6 +355,12 @@ public class ActivityView extends ViewGroup { } } + @Override + protected void onVisibilityChanged(View changedView, int visibility) { + super.onVisibilityChanged(changedView, visibility); + mSurfaceView.setVisibility(visibility); + } + private void initVirtualDisplay(SurfaceSession surfaceSession) { if (mVirtualDisplay != null) { throw new IllegalStateException("Trying to initialize for the second time."); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index e066f06542c3..b657a916604b 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1427,18 +1427,13 @@ public class Notification implements Parcelable */ public static final int SEMANTIC_ACTION_CALL = 10; - /** - * {@code SemanticAction}: Contextual action - dependent on the current notification. E.g. - * open a Map application with an address shown in the notification. - */ - public static final int SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION = 11; - private final Bundle mExtras; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private Icon mIcon; private final RemoteInput[] mRemoteInputs; private boolean mAllowGeneratedReplies = true; private final @SemanticAction int mSemanticAction; + private final boolean mIsContextual; /** * Small icon representing the action. @@ -1474,6 +1469,7 @@ public class Notification implements Parcelable mRemoteInputs = in.createTypedArray(RemoteInput.CREATOR); mAllowGeneratedReplies = in.readInt() == 1; mSemanticAction = in.readInt(); + mIsContextual = in.readInt() == 1; } /** @@ -1482,13 +1478,13 @@ public class Notification implements Parcelable @Deprecated public Action(int icon, CharSequence title, PendingIntent intent) { this(Icon.createWithResource("", icon), title, intent, new Bundle(), null, true, - SEMANTIC_ACTION_NONE); + SEMANTIC_ACTION_NONE, false /* isContextual */); } /** Keep in sync with {@link Notification.Action.Builder#Builder(Action)}! */ private Action(Icon icon, CharSequence title, PendingIntent intent, Bundle extras, RemoteInput[] remoteInputs, boolean allowGeneratedReplies, - @SemanticAction int semanticAction) { + @SemanticAction int semanticAction, boolean isContextual) { this.mIcon = icon; if (icon != null && icon.getType() == Icon.TYPE_RESOURCE) { this.icon = icon.getResId(); @@ -1499,6 +1495,7 @@ public class Notification implements Parcelable this.mRemoteInputs = remoteInputs; this.mAllowGeneratedReplies = allowGeneratedReplies; this.mSemanticAction = semanticAction; + this.mIsContextual = isContextual; } /** @@ -1546,6 +1543,15 @@ public class Notification implements Parcelable } /** + * Returns whether this is a contextual Action, i.e. whether the action is dependent on the + * notification message body. An example of a contextual action could be an action opening a + * map application with an address shown in the notification. + */ + public boolean isContextual() { + return mIsContextual; + } + + /** * Get the list of inputs to be collected from the user that ONLY accept data when this * action is sent. These remote inputs are guaranteed to return true on a call to * {@link RemoteInput#isDataOnly}. @@ -1570,6 +1576,7 @@ public class Notification implements Parcelable private final Bundle mExtras; private ArrayList<RemoteInput> mRemoteInputs; private @SemanticAction int mSemanticAction; + private boolean mIsContextual; /** * Construct a new builder for {@link Action} object. @@ -1684,6 +1691,16 @@ public class Notification implements Parcelable } /** + * Sets whether this {@link Action} is a contextual action, i.e. whether the action is + * dependent on the notification message body. An example of a contextual action could + * be an action opening a map application with an address shown in the notification. + */ + public Builder setContextual(boolean isContextual) { + mIsContextual = isContextual; + return this; + } + + /** * Apply an extender to this action builder. Extenders may be used to add * metadata or change options on this builder. */ @@ -1697,7 +1714,7 @@ public class Notification implements Parcelable * necessary to display the action. */ private void checkContextualActionNullFields() { - if (mSemanticAction != SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION) return; + if (!mIsContextual) return; if (mIcon == null) { throw new NullPointerException("Contextual Actions must contain a valid icon"); @@ -1743,7 +1760,7 @@ public class Notification implements Parcelable RemoteInput[] textInputsArr = textInputs.isEmpty() ? null : textInputs.toArray(new RemoteInput[textInputs.size()]); return new Action(mIcon, mTitle, mIntent, mExtras, textInputsArr, - mAllowGeneratedReplies, mSemanticAction); + mAllowGeneratedReplies, mSemanticAction, mIsContextual); } } @@ -1756,7 +1773,8 @@ public class Notification implements Parcelable mExtras == null ? new Bundle() : new Bundle(mExtras), getRemoteInputs(), getAllowGeneratedReplies(), - getSemanticAction()); + getSemanticAction(), + isContextual()); } @Override @@ -1784,6 +1802,7 @@ public class Notification implements Parcelable out.writeTypedArray(mRemoteInputs, flags); out.writeInt(mAllowGeneratedReplies ? 1 : 0); out.writeInt(mSemanticAction); + out.writeInt(mIsContextual ? 1 : 0); } public static final Parcelable.Creator<Action> CREATOR = @@ -2073,8 +2092,7 @@ public class Notification implements Parcelable SEMANTIC_ACTION_UNMUTE, SEMANTIC_ACTION_THUMBS_UP, SEMANTIC_ACTION_THUMBS_DOWN, - SEMANTIC_ACTION_CALL, - SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION + SEMANTIC_ACTION_CALL }) @Retention(RetentionPolicy.SOURCE) public @interface SemanticAction {} @@ -3230,8 +3248,7 @@ public class Notification implements Parcelable } /** - * Returns the actions that are contextual (marked as SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION) out - * of the actions in this notification. + * Returns the actions that are contextual out of the actions in this notification. * * @hide */ @@ -3240,8 +3257,7 @@ public class Notification implements Parcelable List<Notification.Action> contextualActions = new ArrayList<>(); for (Notification.Action action : actions) { - if (action.getSemanticAction() - == Notification.Action.SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION) { + if (action.isContextual()) { contextualActions.add(action); } } @@ -5062,8 +5078,7 @@ public class Notification implements Parcelable List<Notification.Action> actions) { List<Notification.Action> nonContextualActions = new ArrayList<>(); for (Notification.Action action : actions) { - if (action.getSemanticAction() - != Action.SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION) { + if (!action.isContextual()) { nonContextualActions.add(action); } } diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index bf3d885cd9c9..bbe5b8b51a35 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -69,6 +69,22 @@ public class StatusBarManager { | DISABLE_SYSTEM_INFO | DISABLE_RECENT | DISABLE_HOME | DISABLE_BACK | DISABLE_CLOCK | DISABLE_SEARCH; + @IntDef(flag = true, prefix = {"DISABLE_"}, value = { + DISABLE_NONE, + DISABLE_EXPAND, + DISABLE_NOTIFICATION_ICONS, + DISABLE_NOTIFICATION_ALERTS, + DISABLE_NOTIFICATION_TICKER, + DISABLE_SYSTEM_INFO, + DISABLE_HOME, + DISABLE_RECENT, + DISABLE_BACK, + DISABLE_CLOCK, + DISABLE_SEARCH + }) + @Retention(RetentionPolicy.SOURCE) + public @interface DisableFlags {} + /** * Flag to disable quick settings. * @@ -104,10 +120,25 @@ public class StatusBarManager { public static final int WINDOW_STATUS_BAR = 1; public static final int WINDOW_NAVIGATION_BAR = 2; + @IntDef(flag = true, prefix = { "WINDOW_" }, value = { + WINDOW_STATUS_BAR, + WINDOW_NAVIGATION_BAR + }) + @Retention(RetentionPolicy.SOURCE) + public @interface WindowType {} + public static final int WINDOW_STATE_SHOWING = 0; public static final int WINDOW_STATE_HIDING = 1; public static final int WINDOW_STATE_HIDDEN = 2; + @IntDef(flag = true, prefix = { "WINDOW_STATE_" }, value = { + WINDOW_STATE_SHOWING, + WINDOW_STATE_HIDING, + WINDOW_STATE_HIDDEN + }) + @Retention(RetentionPolicy.SOURCE) + public @interface WindowVisibleState {} + public static final int CAMERA_LAUNCH_SOURCE_WIGGLE = 0; public static final int CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = 1; public static final int CAMERA_LAUNCH_SOURCE_LIFT_TRIGGER = 2; diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 3f6ebc8e63e9..9ddf4bd0870c 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -144,6 +144,7 @@ import android.os.UserManager; import android.os.Vibrator; import android.os.health.SystemHealthManager; import android.os.storage.StorageManager; +import android.permission.PermissionControllerManager; import android.permission.PermissionManager; import android.print.IPrintManager; import android.print.PrintManager; @@ -1164,6 +1165,13 @@ final class SystemServiceRegistry { return new PermissionManager(ctx.getOuterContext()); }}); + registerService(Context.PERMISSION_CONTROLLER_SERVICE, PermissionControllerManager.class, + new CachedServiceFetcher<PermissionControllerManager>() { + @Override + public PermissionControllerManager createService(ContextImpl ctx) { + return new PermissionControllerManager(ctx.getOuterContext()); + }}); + registerService(Context.ROLE_SERVICE, RoleManager.class, new CachedServiceFetcher<RoleManager>() { @Override diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index f843262933ff..7da67d9e14e4 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -907,9 +907,8 @@ public class DevicePolicyManager { = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER"; /** - * A String extra holding the URL-safe base64 encoded SHA-256 or SHA-1 hash (see notes below) of - * the file at download location specified in - * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}. + * A String extra holding the URL-safe base64 encoded SHA-256 hash of the file at download + * location specified in {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}. * * <p>Either this extra or {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM} must be * present. The provided checksum must match the checksum of the file at the download @@ -922,7 +921,8 @@ public class DevicePolicyManager { * <p><strong>Note:</strong> for devices running {@link android.os.Build.VERSION_CODES#LOLLIPOP} * and {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1} only SHA-1 hash is supported. * Starting from {@link android.os.Build.VERSION_CODES#M}, this parameter accepts SHA-256 in - * addition to SHA-1. Support for SHA-1 is likely to be removed in future OS releases. + * addition to SHA-1. From {@link android.os.Build.VERSION_CODES#Q}, only SHA-256 hash is + * supported. */ public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 125c4c6b6503..eb7be6f8a6b0 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3993,6 +3993,14 @@ public abstract class Context { public static final String PERMISSION_SERVICE = "permission"; /** + * Official published name of the (internal) permission controller service. + * + * @see #getSystemService(String) + * @hide + */ + public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller"; + + /** * Use with {@link #getSystemService(String)} to retrieve an * {@link android.app.backup.IBackupManager IBackupManager} for communicating * with the backup mechanism. @@ -4009,9 +4017,9 @@ public abstract class Context { * with the rollback manager * * @see #getSystemService(String) - * @hide TODO(ruhler): hidden, @TestApi until we decide on public vs. @SystemApi. + * @hide */ - @TestApi + @SystemApi public static final String ROLLBACK_SERVICE = "rollback"; /** diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 34922000e3cf..7b3497b8b483 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -27,7 +27,6 @@ import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; @@ -2268,9 +2267,9 @@ public class Intent implements Parcelable, Cloneable { * <p class="note">This is a protected intent that can only be sent * by the system. * - * @hide TODO: hidden, @TestApi until we decide on public vs. @SystemApi. + * @hide */ - @TestApi + @SystemApi @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_PACKAGE_ROLLBACK_EXECUTED = "android.intent.action.PACKAGE_ROLLBACK_EXECUTED"; diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index a2fd83f9d8a0..94b7c4538c51 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -24,7 +24,6 @@ import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; import android.app.ActivityManager; import android.app.AppGlobals; @@ -1428,9 +1427,9 @@ public class PackageInstaller { /** * Request that rollbacks be enabled for the given upgrade. - * @hide TODO: hidden, @TestApi until we decide on public vs. @SystemApi. + * @hide */ - @TestApi + @SystemApi public void setEnableRollback() { installFlags |= PackageManager.INSTALL_ENABLE_ROLLBACK; } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 611055759868..2aeb68da365b 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1368,6 +1368,14 @@ public abstract class PackageManager { */ public static final int INSTALL_FAILED_BAD_DEX_METADATA = -117; + /** + * Installation parse return code: this is passed in the + * {@link PackageInstaller#EXTRA_LEGACY_STATUS} if there is any signature problem. + * + * @hide + */ + public static final int INSTALL_FAILED_BAD_SIGNATURE = -118; + /** @hide */ @IntDef(flag = true, prefix = { "DELETE_" }, value = { DELETE_KEEP_DATA, @@ -1931,6 +1939,30 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports uicc- + * based NFC card emulation. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC = + "android.hardware.nfc.uicc"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports eSE- + * based NFC card emulation. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE = "android.hardware.nfc.ese"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The Beam API is enabled on the device. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_NFC_BEAM = "android.sofware.nfc.beam"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device supports any * one of the {@link #FEATURE_NFC}, {@link #FEATURE_NFC_HOST_CARD_EMULATION}, * or {@link #FEATURE_NFC_HOST_CARD_EMULATION_NFCF} features. @@ -6243,6 +6275,7 @@ public abstract class PackageManager { case INSTALL_FAILED_ABORTED: return "INSTALL_FAILED_ABORTED"; case INSTALL_FAILED_BAD_DEX_METADATA: return "INSTALL_FAILED_BAD_DEX_METADATA"; case INSTALL_FAILED_MISSING_SPLIT: return "INSTALL_FAILED_MISSING_SPLIT"; + case INSTALL_FAILED_BAD_SIGNATURE: return "INSTALL_FAILED_BAD_SIGNATURE"; default: return Integer.toString(status); } } @@ -6288,6 +6321,7 @@ public abstract class PackageManager { case INSTALL_PARSE_FAILED_MANIFEST_MALFORMED: return PackageInstaller.STATUS_FAILURE_INVALID; case INSTALL_PARSE_FAILED_MANIFEST_EMPTY: return PackageInstaller.STATUS_FAILURE_INVALID; case INSTALL_FAILED_BAD_DEX_METADATA: return PackageInstaller.STATUS_FAILURE_INVALID; + case INSTALL_FAILED_BAD_SIGNATURE: return PackageInstaller.STATUS_FAILURE_INVALID; case INSTALL_FAILED_INTERNAL_ERROR: return PackageInstaller.STATUS_FAILURE; case INSTALL_FAILED_USER_RESTRICTED: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE; case INSTALL_FAILED_DUPLICATE_PERMISSION: return PackageInstaller.STATUS_FAILURE_CONFLICT; diff --git a/core/java/android/content/rollback/PackageRollbackInfo.java b/core/java/android/content/rollback/PackageRollbackInfo.java index 0c057656d59a..204002426d17 100644 --- a/core/java/android/content/rollback/PackageRollbackInfo.java +++ b/core/java/android/content/rollback/PackageRollbackInfo.java @@ -16,7 +16,7 @@ package android.content.rollback; -import android.annotation.TestApi; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,9 @@ import java.util.Objects; /** * Information about a rollback available for a particular package. * - * @hide TODO: hidden, @TestApi until we decide on public vs. @SystemApi. + * @hide */ -@TestApi +@SystemApi public final class PackageRollbackInfo implements Parcelable { /** * The name of a package being rolled back. diff --git a/core/java/android/content/rollback/RollbackInfo.java b/core/java/android/content/rollback/RollbackInfo.java index 5fa4e57e78e5..66df4fea3f23 100644 --- a/core/java/android/content/rollback/RollbackInfo.java +++ b/core/java/android/content/rollback/RollbackInfo.java @@ -16,7 +16,7 @@ package android.content.rollback; -import android.annotation.TestApi; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -24,9 +24,9 @@ import android.os.Parcelable; * Information about a set of packages that can be, or already have been * rolled back together. * - * @hide TODO: hidden, @TestApi until we decide on public vs. @SystemApi. + * @hide */ -@TestApi +@SystemApi public final class RollbackInfo implements Parcelable { /** @@ -39,6 +39,7 @@ public final class RollbackInfo implements Parcelable { // TODO: Add a flag to indicate if reboot is required, when rollback of // staged installs is supported. + /** @hide */ public RollbackInfo(PackageRollbackInfo targetPackage) { this.targetPackage = targetPackage; } diff --git a/core/java/android/content/rollback/RollbackManager.java b/core/java/android/content/rollback/RollbackManager.java index 294151aff82c..c1c0bc1d3e07 100644 --- a/core/java/android/content/rollback/RollbackManager.java +++ b/core/java/android/content/rollback/RollbackManager.java @@ -18,8 +18,9 @@ package android.content.rollback; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; +import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.content.Context; import android.content.IntentSender; import android.os.RemoteException; @@ -33,12 +34,10 @@ import java.util.List; * used to initiate rollback of those packages for a limited time period after * upgrade. * - * TODO: Require an appropriate permission for apps to use these APIs. - * * @see PackageInstaller.SessionParams#setEnableRollback() - * @hide TODO: hidden, @TestApi until we decide on public vs. @SystemApi. + * @hide */ -@TestApi +@SystemApi @SystemService(Context.ROLLBACK_SERVICE) public final class RollbackManager { private final String mCallerPackageName; @@ -63,7 +62,10 @@ public final class RollbackManager { * @param packageName name of the package to get the availble RollbackInfo for. * @return the rollback available for the package, or null if no rollback * is available for the package. + * @throws SecurityException if the caller does not have the + * MANAGE_ROLLBACKS permission. */ + @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public @Nullable RollbackInfo getAvailableRollback(@NonNull String packageName) { try { return mBinder.getAvailableRollback(packageName); @@ -78,7 +80,10 @@ public final class RollbackManager { * about the rollback available for a particular package. * * @return the names of packages that are available for rollback. + * @throws SecurityException if the caller does not have the + * MANAGE_ROLLBACKS permission. */ + @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public @NonNull List<String> getPackagesWithAvailableRollbacks() { try { return mBinder.getPackagesWithAvailableRollbacks().getList(); @@ -103,7 +108,10 @@ public final class RollbackManager { * rolled back from. * * @return the recently executed rollbacks + * @throws SecurityException if the caller does not have the + * MANAGE_ROLLBACKS permission. */ + @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public @NonNull List<RollbackInfo> getRecentlyExecutedRollbacks() { try { return mBinder.getRecentlyExecutedRollbacks().getList(); @@ -127,7 +135,10 @@ public final class RollbackManager { * * @param rollback to execute * @param statusReceiver where to deliver the results + * @throws SecurityException if the caller does not have the + * MANAGE_ROLLBACKS permission. */ + @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void executeRollback(@NonNull RollbackInfo rollback, @NonNull IntentSender statusReceiver) { try { @@ -143,9 +154,10 @@ public final class RollbackManager { * across device reboot, by simulating what happens on reboot without * actually rebooting the device. * - * @hide + * @throws SecurityException if the caller does not have the + * MANAGE_ROLLBACKS permission. */ - @TestApi + @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void reloadPersistedData() { try { mBinder.reloadPersistedData(); @@ -160,10 +172,10 @@ public final class RollbackManager { * expiring rollback data. * * @param packageName the name of the package to expire data for. - * - * @hide + * @throws SecurityException if the caller does not have the + * MANAGE_ROLLBACKS permission. */ - @TestApi + @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void expireRollbackForPackage(@NonNull String packageName) { try { mBinder.expireRollbackForPackage(packageName); diff --git a/core/java/android/hardware/display/BrightnessConfiguration.java b/core/java/android/hardware/display/BrightnessConfiguration.java index be054297c769..7e52ca331f9f 100644 --- a/core/java/android/hardware/display/BrightnessConfiguration.java +++ b/core/java/android/hardware/display/BrightnessConfiguration.java @@ -19,54 +19,26 @@ package android.hardware.display; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; -import android.content.pm.ApplicationInfo; import android.os.Parcel; import android.os.Parcelable; import android.util.Pair; import com.android.internal.util.Preconditions; -import com.android.internal.util.XmlUtils; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlSerializer; - -import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import java.util.Objects; /** @hide */ @SystemApi @TestApi public final class BrightnessConfiguration implements Parcelable { - private static final String TAG_BRIGHTNESS_CURVE = "brightness-curve"; - private static final String TAG_BRIGHTNESS_POINT = "brightness-point"; - private static final String TAG_BRIGHTNESS_CORRECTIONS = "brightness-corrections"; - private static final String TAG_BRIGHTNESS_CORRECTION = "brightness-correction"; - private static final String ATTR_LUX = "lux"; - private static final String ATTR_NITS = "nits"; - private static final String ATTR_DESCRIPTION = "description"; - private static final String ATTR_PACKAGE_NAME = "package-name"; - private static final String ATTR_CATEGORY = "category"; - private final float[] mLux; private final float[] mNits; - private final Map<String, BrightnessCorrection> mCorrectionsByPackageName; - private final Map<Integer, BrightnessCorrection> mCorrectionsByCategory; private final String mDescription; - private BrightnessConfiguration(float[] lux, float[] nits, - Map<String, BrightnessCorrection> correctionsByPackageName, - Map<Integer, BrightnessCorrection> correctionsByCategory, String description) { + private BrightnessConfiguration(float[] lux, float[] nits, String description) { mLux = lux; mNits = nits; - mCorrectionsByPackageName = correctionsByPackageName; - mCorrectionsByCategory = correctionsByCategory; mDescription = description; } @@ -84,38 +56,6 @@ public final class BrightnessConfiguration implements Parcelable { } /** - * Returns a brightness correction by app, or null. - * - * @param packageName - * The app's package name. - * - * @return The matching brightness correction, or null. - * - * @hide - */ - @SystemApi - @Nullable - public BrightnessCorrection getCorrectionByPackageName(String packageName) { - return mCorrectionsByPackageName.get(packageName); - } - - /** - * Returns a brightness correction by app category, or null. - * - * @param category - * The app category. - * - * @return The matching brightness correction, or null. - * - * @hide - */ - @SystemApi - @Nullable - public BrightnessCorrection getCorrectionByCategory(int category) { - return mCorrectionsByCategory.get(category); - } - - /** * Returns description string. * @hide */ @@ -127,20 +67,6 @@ public final class BrightnessConfiguration implements Parcelable { public void writeToParcel(Parcel dest, int flags) { dest.writeFloatArray(mLux); dest.writeFloatArray(mNits); - dest.writeInt(mCorrectionsByPackageName.size()); - for (Entry<String, BrightnessCorrection> entry : mCorrectionsByPackageName.entrySet()) { - final String packageName = entry.getKey(); - final BrightnessCorrection correction = entry.getValue(); - dest.writeString(packageName); - correction.writeToParcel(dest, flags); - } - dest.writeInt(mCorrectionsByCategory.size()); - for (Entry<Integer, BrightnessCorrection> entry : mCorrectionsByCategory.entrySet()) { - final int category = entry.getKey(); - final BrightnessCorrection correction = entry.getValue(); - dest.writeInt(category); - correction.writeToParcel(dest, flags); - } dest.writeString(mDescription); } @@ -159,14 +85,7 @@ public final class BrightnessConfiguration implements Parcelable { } sb.append("(").append(mLux[i]).append(", ").append(mNits[i]).append(")"); } - sb.append("], {"); - for (Entry<String, BrightnessCorrection> entry : mCorrectionsByPackageName.entrySet()) { - sb.append("'" + entry.getKey() + "': " + entry.getValue() + ", "); - } - for (Entry<Integer, BrightnessCorrection> entry : mCorrectionsByCategory.entrySet()) { - sb.append(entry.getKey() + ": " + entry.getValue() + ", "); - } - sb.append("}, '"); + sb.append("], '"); if (mDescription != null) { sb.append(mDescription); } @@ -179,8 +98,6 @@ public final class BrightnessConfiguration implements Parcelable { int result = 1; result = result * 31 + Arrays.hashCode(mLux); result = result * 31 + Arrays.hashCode(mNits); - result = result * 31 + mCorrectionsByPackageName.hashCode(); - result = result * 31 + mCorrectionsByCategory.hashCode(); if (mDescription != null) { result = result * 31 + mDescription.hashCode(); } @@ -197,8 +114,6 @@ public final class BrightnessConfiguration implements Parcelable { } final BrightnessConfiguration other = (BrightnessConfiguration) o; return Arrays.equals(mLux, other.mLux) && Arrays.equals(mNits, other.mNits) - && mCorrectionsByPackageName.equals(other.mCorrectionsByPackageName) - && mCorrectionsByCategory.equals(other.mCorrectionsByCategory) && Objects.equals(mDescription, other.mDescription); } @@ -208,25 +123,7 @@ public final class BrightnessConfiguration implements Parcelable { float[] lux = in.createFloatArray(); float[] nits = in.createFloatArray(); Builder builder = new Builder(lux, nits); - - int n = in.readInt(); - for (int i = 0; i < n; i++) { - final String packageName = in.readString(); - final BrightnessCorrection correction = - BrightnessCorrection.CREATOR.createFromParcel(in); - builder.addCorrectionByPackageName(packageName, correction); - } - - n = in.readInt(); - for (int i = 0; i < n; i++) { - final int category = in.readInt(); - final BrightnessCorrection correction = - BrightnessCorrection.CREATOR.createFromParcel(in); - builder.addCorrectionByCategory(category, correction); - } - - final String description = in.readString(); - builder.setDescription(description); + builder.setDescription(in.readString()); return builder.build(); } @@ -236,146 +133,11 @@ public final class BrightnessConfiguration implements Parcelable { }; /** - * Writes the configuration to an XML serializer. - * - * @param serializer - * The XML serializer. - * - * @hide - */ - public void saveToXml(XmlSerializer serializer) throws IOException { - serializer.startTag(null, TAG_BRIGHTNESS_CURVE); - if (mDescription != null) { - serializer.attribute(null, ATTR_DESCRIPTION, mDescription); - } - for (int i = 0; i < mLux.length; i++) { - serializer.startTag(null, TAG_BRIGHTNESS_POINT); - serializer.attribute(null, ATTR_LUX, Float.toString(mLux[i])); - serializer.attribute(null, ATTR_NITS, Float.toString(mNits[i])); - serializer.endTag(null, TAG_BRIGHTNESS_POINT); - } - serializer.endTag(null, TAG_BRIGHTNESS_CURVE); - serializer.startTag(null, TAG_BRIGHTNESS_CORRECTIONS); - for (Map.Entry<String, BrightnessCorrection> entry : - mCorrectionsByPackageName.entrySet()) { - final String packageName = entry.getKey(); - final BrightnessCorrection correction = entry.getValue(); - serializer.startTag(null, TAG_BRIGHTNESS_CORRECTION); - serializer.attribute(null, ATTR_PACKAGE_NAME, packageName); - correction.saveToXml(serializer); - serializer.endTag(null, TAG_BRIGHTNESS_CORRECTION); - } - for (Map.Entry<Integer, BrightnessCorrection> entry : mCorrectionsByCategory.entrySet()) { - final int category = entry.getKey(); - final BrightnessCorrection correction = entry.getValue(); - serializer.startTag(null, TAG_BRIGHTNESS_CORRECTION); - serializer.attribute(null, ATTR_CATEGORY, Integer.toString(category)); - correction.saveToXml(serializer); - serializer.endTag(null, TAG_BRIGHTNESS_CORRECTION); - } - serializer.endTag(null, TAG_BRIGHTNESS_CORRECTIONS); - } - - /** - * Read a configuration from an XML parser. - * - * @param parser - * The XML parser. - * - * @throws IOException - * The parser failed to read the XML file. - * @throws XmlPullParserException - * The parser failed to parse the XML file. - * - * @hide - */ - public static BrightnessConfiguration loadFromXml(XmlPullParser parser) - throws IOException, XmlPullParserException { - String description = null; - List<Float> luxList = new ArrayList<>(); - List<Float> nitsList = new ArrayList<>(); - Map<String, BrightnessCorrection> correctionsByPackageName = new HashMap<>(); - Map<Integer, BrightnessCorrection> correctionsByCategory = new HashMap<>(); - final int configDepth = parser.getDepth(); - while (XmlUtils.nextElementWithin(parser, configDepth)) { - if (TAG_BRIGHTNESS_CURVE.equals(parser.getName())) { - description = parser.getAttributeValue(null, ATTR_DESCRIPTION); - final int curveDepth = parser.getDepth(); - while (XmlUtils.nextElementWithin(parser, curveDepth)) { - if (!TAG_BRIGHTNESS_POINT.equals(parser.getName())) { - continue; - } - final float lux = loadFloatFromXml(parser, ATTR_LUX); - final float nits = loadFloatFromXml(parser, ATTR_NITS); - luxList.add(lux); - nitsList.add(nits); - } - } - if (TAG_BRIGHTNESS_CORRECTIONS.equals(parser.getName())) { - final int correctionsDepth = parser.getDepth(); - while (XmlUtils.nextElementWithin(parser, correctionsDepth)) { - if (!TAG_BRIGHTNESS_CORRECTION.equals(parser.getName())) { - continue; - } - final String packageName = parser.getAttributeValue(null, ATTR_PACKAGE_NAME); - final String categoryText = parser.getAttributeValue(null, ATTR_CATEGORY); - BrightnessCorrection correction = BrightnessCorrection.loadFromXml(parser); - if (packageName != null) { - correctionsByPackageName.put(packageName, correction); - } else if (categoryText != null) { - try { - final int category = Integer.parseInt(categoryText); - correctionsByCategory.put(category, correction); - } catch (NullPointerException | NumberFormatException e) { - continue; - } - } - } - } - } - final int n = luxList.size(); - float[] lux = new float[n]; - float[] nits = new float[n]; - for (int i = 0; i < n; i++) { - lux[i] = luxList.get(i); - nits[i] = nitsList.get(i); - } - final BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(lux, - nits); - builder.setDescription(description); - for (Map.Entry<String, BrightnessCorrection> entry : correctionsByPackageName.entrySet()) { - final String packageName = entry.getKey(); - final BrightnessCorrection correction = entry.getValue(); - builder.addCorrectionByPackageName(packageName, correction); - } - for (Map.Entry<Integer, BrightnessCorrection> entry : correctionsByCategory.entrySet()) { - final int category = entry.getKey(); - final BrightnessCorrection correction = entry.getValue(); - builder.addCorrectionByCategory(category, correction); - } - return builder.build(); - } - - private static float loadFloatFromXml(XmlPullParser parser, String attribute) { - final String string = parser.getAttributeValue(null, attribute); - try { - return Float.parseFloat(string); - } catch (NullPointerException | NumberFormatException e) { - return Float.NaN; - } - } - - /** * A builder class for {@link BrightnessConfiguration}s. */ public static class Builder { - private static final int MAX_CORRECTIONS_BY_PACKAGE_NAME = 20; - private static final int MAX_CORRECTIONS_BY_CATEGORY = 20; - private float[] mCurveLux; private float[] mCurveNits; - private Map<String, BrightnessCorrection> mCorrectionsByPackageName; - private Map<Integer, BrightnessCorrection> mCorrectionsByCategory; private String mDescription; /** @@ -407,88 +169,6 @@ public final class BrightnessConfiguration implements Parcelable { checkMonotonic(nits, false /*strictly increasing*/, "nits"); mCurveLux = lux; mCurveNits = nits; - mCorrectionsByPackageName = new HashMap<>(); - mCorrectionsByCategory = new HashMap<>(); - } - - /** - * Returns the maximum number of corrections by package name allowed. - * - * @return The maximum number of corrections by package name allowed. - * - * @hide - */ - @SystemApi - public int getMaxCorrectionsByPackageName() { - return MAX_CORRECTIONS_BY_PACKAGE_NAME; - } - - /** - * Returns the maximum number of corrections by category allowed. - * - * @return The maximum number of corrections by category allowed. - * - * @hide - */ - @SystemApi - public int getMaxCorrectionsByCategory() { - return MAX_CORRECTIONS_BY_CATEGORY; - } - - /** - * Add a brightness correction by app package name. - * This correction is applied whenever an app with this package name has the top activity - * of the focused stack. - * - * @param packageName - * The app's package name. - * @param correction - * The brightness correction. - * - * @return The builder. - * - * @throws IllegalArgumentExceptions - * Maximum number of corrections by package name exceeded (see - * {@link #getMaxCorrectionsByPackageName}). - * - * @hide - */ - @SystemApi - public Builder addCorrectionByPackageName(String packageName, - BrightnessCorrection correction) { - if (mCorrectionsByPackageName.size() >= getMaxCorrectionsByPackageName()) { - throw new IllegalArgumentException("Too many corrections by package name"); - } - mCorrectionsByPackageName.put(packageName, correction); - return this; - } - - /** - * Add a brightness correction by app category. - * This correction is applied whenever an app with this category has the top activity of - * the focused stack, and only if a correction by package name has not been applied. - * - * @param category - * The {@link android.content.pm.ApplicationInfo#category app category}. - * @param correction - * The brightness correction. - * - * @return The builder. - * - * @throws IllegalArgumentException - * Maximum number of corrections by category exceeded (see - * {@link #getMaxCorrectionsByCategory}). - * - * @hide - */ - @SystemApi - public Builder addCorrectionByCategory(@ApplicationInfo.Category int category, - BrightnessCorrection correction) { - if (mCorrectionsByCategory.size() >= getMaxCorrectionsByCategory()) { - throw new IllegalArgumentException("Too many corrections by category"); - } - mCorrectionsByCategory.put(category, correction); - return this; } /** @@ -511,8 +191,7 @@ public final class BrightnessConfiguration implements Parcelable { if (mCurveLux == null || mCurveNits == null) { throw new IllegalStateException("A curve must be set!"); } - return new BrightnessConfiguration(mCurveLux, mCurveNits, mCorrectionsByPackageName, - mCorrectionsByCategory, mDescription); + return new BrightnessConfiguration(mCurveLux, mCurveNits, mDescription); } private static void checkMonotonic(float[] vals, boolean strictlyIncreasing, String name) { diff --git a/core/java/android/hardware/display/BrightnessCorrection.java b/core/java/android/hardware/display/BrightnessCorrection.java deleted file mode 100644 index c4e0e3b723cd..000000000000 --- a/core/java/android/hardware/display/BrightnessCorrection.java +++ /dev/null @@ -1,245 +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.hardware.display; - -import android.annotation.NonNull; -import android.annotation.SystemApi; -import android.os.Parcel; -import android.os.Parcelable; -import android.util.MathUtils; - -import com.android.internal.util.XmlUtils; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlSerializer; - -import java.io.IOException; - -/** - * BrightnessCorrection encapsulates a correction to the brightness, without comitting to the - * actual correction scheme. - * It is used by the BrightnessConfiguration, which maps context (e.g. the foreground app's package - * name and category) to corrections that need to be applied to the brightness within that context. - * Corrections are currently done by the app that has the top activity of the focused stack, either - * by its package name, or (if its package name is not mapped to any correction) by its category. - * - * @hide - */ -@SystemApi -public final class BrightnessCorrection implements Parcelable { - - private static final int SCALE_AND_TRANSLATE_LOG = 1; - - private static final String TAG_SCALE_AND_TRANSLATE_LOG = "scale-and-translate-log"; - - private BrightnessCorrectionImplementation mImplementation; - - // Parcelable classes must be final, and protected methods are not allowed in APIs, so we can't - // make this class abstract and use composition instead of inheritence. - private BrightnessCorrection(BrightnessCorrectionImplementation implementation) { - mImplementation = implementation; - } - - /** - * Creates a BrightnessCorrection that given {@code brightness}, corrects it to be - * {@code exp(scale * log(brightness) + translate)}. - * - * @param scale - * How much to scale the log brightness. - * @param translate - * How much to translate the log brightness. - * - * @return A BrightnessCorrection that given {@code brightness}, corrects it to be - * {@code exp(scale * log(brightness) + translate)}. - * - * @throws IllegalArgumentException - * - scale or translate are NaN. - */ - @NonNull - public static BrightnessCorrection createScaleAndTranslateLog(float scale, float translate) { - BrightnessCorrectionImplementation implementation = - new ScaleAndTranslateLog(scale, translate); - return new BrightnessCorrection(implementation); - } - - /** - * Applies the brightness correction to a given brightness. - * - * @param brightness - * The brightness. - * - * @return The corrected brightness. - */ - public float apply(float brightness) { - return mImplementation.apply(brightness); - } - - /** - * Returns a string representation. - * - * @return A string representation. - */ - public String toString() { - return mImplementation.toString(); - } - - public static final Creator<BrightnessCorrection> CREATOR = - new Creator<BrightnessCorrection>() { - public BrightnessCorrection createFromParcel(Parcel in) { - final int type = in.readInt(); - switch (type) { - case SCALE_AND_TRANSLATE_LOG: - return ScaleAndTranslateLog.readFromParcel(in); - } - return null; - } - - public BrightnessCorrection[] newArray(int size) { - return new BrightnessCorrection[size]; - } - }; - - @Override - public void writeToParcel(Parcel dest, int flags) { - mImplementation.writeToParcel(dest); - } - - @Override - public int describeContents() { - return 0; - } - - /** - * Writes the correction to an XML serializer. - * - * @param serializer - * The XML serializer. - * - * @hide - */ - public void saveToXml(XmlSerializer serializer) throws IOException { - mImplementation.saveToXml(serializer); - } - - /** - * Read a correction from an XML parser. - * - * @param parser - * The XML parser. - * - * @throws IOException - * The parser failed to read the XML file. - * @throws XmlPullParserException - * The parser failed to parse the XML file. - * - * @hide - */ - public static BrightnessCorrection loadFromXml(XmlPullParser parser) throws IOException, - XmlPullParserException { - final int depth = parser.getDepth(); - while (XmlUtils.nextElementWithin(parser, depth)) { - if (TAG_SCALE_AND_TRANSLATE_LOG.equals(parser.getName())) { - return ScaleAndTranslateLog.loadFromXml(parser); - } - } - return null; - } - - private static float loadFloatFromXml(XmlPullParser parser, String attribute) { - final String string = parser.getAttributeValue(null, attribute); - try { - return Float.parseFloat(string); - } catch (NullPointerException | NumberFormatException e) { - return Float.NaN; - } - } - - private interface BrightnessCorrectionImplementation { - float apply(float brightness); - String toString(); - void writeToParcel(Parcel dest); - void saveToXml(XmlSerializer serializer) throws IOException; - // Package-private static methods: - // static BrightnessCorrection readFromParcel(Parcel in); - // static BrightnessCorrection loadFromXml(XmlPullParser parser) throws IOException, - // XmlPullParserException; - } - - /** - * A BrightnessCorrection that given {@code brightness}, corrects it to be - * {@code exp(scale * log(brightness) + translate)}. - */ - private static class ScaleAndTranslateLog implements BrightnessCorrectionImplementation { - private static final float MIN_SCALE = 0.5f; - private static final float MAX_SCALE = 2.0f; - private static final float MIN_TRANSLATE = -0.6f; - private static final float MAX_TRANSLATE = 0.7f; - - private static final String ATTR_SCALE = "scale"; - private static final String ATTR_TRANSLATE = "translate"; - - private final float mScale; - private final float mTranslate; - - ScaleAndTranslateLog(float scale, float translate) { - if (Float.isNaN(scale) || Float.isNaN(translate)) { - throw new IllegalArgumentException("scale and translate must be numbers"); - } - mScale = MathUtils.constrain(scale, MIN_SCALE, MAX_SCALE); - mTranslate = MathUtils.constrain(translate, MIN_TRANSLATE, MAX_TRANSLATE); - } - - @Override - public float apply(float brightness) { - return MathUtils.exp(mScale * MathUtils.log(brightness) + mTranslate); - } - - @Override - public String toString() { - return "ScaleAndTranslateLog(" + mScale + ", " + mTranslate + ")"; - } - - @Override - public void writeToParcel(Parcel dest) { - dest.writeInt(SCALE_AND_TRANSLATE_LOG); - dest.writeFloat(mScale); - dest.writeFloat(mTranslate); - } - - @Override - public void saveToXml(XmlSerializer serializer) throws IOException { - serializer.startTag(null, TAG_SCALE_AND_TRANSLATE_LOG); - serializer.attribute(null, ATTR_SCALE, Float.toString(mScale)); - serializer.attribute(null, ATTR_TRANSLATE, Float.toString(mTranslate)); - serializer.endTag(null, TAG_SCALE_AND_TRANSLATE_LOG); - } - - static BrightnessCorrection readFromParcel(Parcel in) { - float scale = in.readFloat(); - float translate = in.readFloat(); - return BrightnessCorrection.createScaleAndTranslateLog(scale, translate); - } - - static BrightnessCorrection loadFromXml(XmlPullParser parser) throws IOException, - XmlPullParserException { - final float scale = loadFloatFromXml(parser, ATTR_SCALE); - final float translate = loadFloatFromXml(parser, ATTR_TRANSLATE); - return BrightnessCorrection.createScaleAndTranslateLog(scale, translate); - } - } -} diff --git a/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java b/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java index 9bebbd22c38c..d382eb9310d9 100644 --- a/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java +++ b/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java @@ -17,6 +17,7 @@ package android.hardware.hdmi; import android.annotation.Nullable; import android.os.Handler; +import android.os.Looper; import android.os.RemoteException; import com.android.internal.annotations.VisibleForTesting; @@ -52,7 +53,7 @@ public final class HdmiAudioSystemClient extends HdmiClient { @VisibleForTesting(visibility = Visibility.PACKAGE) public HdmiAudioSystemClient(IHdmiControlService service, @Nullable Handler handler) { super(service); - mHandler = handler == null ? new Handler() : handler; + mHandler = handler == null ? new Handler(Looper.getMainLooper()) : handler; } /** @hide */ diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index 72a6ffe3aac4..b520d2c14edc 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -388,6 +388,19 @@ public final class HdmiControlManager { } /** + * Gets whether the system is in system audio mode. + * + * @hide + */ + public boolean getSystemAudioMode() { + try { + return mService.getSystemAudioMode(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Listener used to get hotplug event from HDMI port. */ public interface HotplugEventListener { diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java index a00b9a3caeba..9cf582bef1d4 100644 --- a/core/java/android/net/NetworkStats.java +++ b/core/java/android/net/NetworkStats.java @@ -16,6 +16,8 @@ package android.net; +import static android.os.Process.CLAT_UID; + import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -828,13 +830,15 @@ public class NetworkStats implements Parcelable { * * <p>For 464xlat traffic, xt_qtaguid sees every IPv4 packet twice, once as a native IPv4 * packet on the stacked interface, and once as translated to an IPv6 packet on the - * base interface. For correct stats accounting on the base interface, every 464xlat - * packet needs to be subtracted from the root UID on the base interface both for tx - * and rx traffic (http://b/12249687, http:/b/33681750). + * base interface. For correct stats accounting on the base interface, if using xt_qtaguid, + * every rx 464xlat packet needs to be subtracted from the root UID on the base interface + * (http://b/12249687, http:/b/33681750), and every tx 464xlat packet which was counted onto + * clat uid should be ignored. * * As for eBPF, the per uid stats is collected by different hook, the rx packets on base - * interface will not be counted. Thus, the adjustment on root uid is only needed in tx - * direction. + * interface will not be counted. Thus, the adjustment on root uid is not needed. However, the + * tx traffic counted in the same way xt_qtaguid does, so the traffic on clat uid still + * needs to be ignored. * * <p>This method will behave fine if {@code stackedIfaces} is an non-synchronized but add-only * {@code ConcurrentHashMap} @@ -862,17 +866,14 @@ public class NetworkStats implements Parcelable { if (baseIface == null) { continue; } - // Subtract any 464lat traffic seen for the root UID on the current base interface. - // However, for eBPF, the per uid stats is collected by different hook, the rx packets - // on base interface will not be counted. Thus, the adjustment on root uid is only - // needed in tx direction. + // Subtract xt_qtaguid 464lat rx traffic seen for the root UID on the current base + // interface. As for eBPF, the per uid stats is collected by different hook, the rx + // packets on base interface will not be counted. adjust.iface = baseIface; if (!useBpfStats) { adjust.rxBytes = -(entry.rxBytes + entry.rxPackets * IPV4V6_HEADER_DELTA); adjust.rxPackets = -entry.rxPackets; } - adjust.txBytes = -(entry.txBytes + entry.txPackets * IPV4V6_HEADER_DELTA); - adjust.txPackets = -entry.txPackets; adjustments.combineValues(adjust); // For 464xlat traffic, per uid stats only counts the bytes of the native IPv4 packet @@ -884,6 +885,9 @@ public class NetworkStats implements Parcelable { stackedTraffic.setValues(i, entry); } + // Traffic on clat uid is v6 tx traffic that is already counted with app uid on the stacked + // v4 interface, so it needs to be removed to avoid double-counting. + baseTraffic.removeUids(new int[] {CLAT_UID}); baseTraffic.combineAllValues(adjustments); } diff --git a/core/java/android/nfc/INfcCardEmulation.aidl b/core/java/android/nfc/INfcCardEmulation.aidl index d1b132c6abfa..dd2c0d4f9ee5 100644 --- a/core/java/android/nfc/INfcCardEmulation.aidl +++ b/core/java/android/nfc/INfcCardEmulation.aidl @@ -31,6 +31,8 @@ interface INfcCardEmulation boolean setDefaultServiceForCategory(int userHandle, in ComponentName service, String category); boolean setDefaultForNextTap(int userHandle, in ComponentName service); boolean registerAidGroupForService(int userHandle, in ComponentName service, in AidGroup aidGroup); + boolean setOffHostForService(int userHandle, in ComponentName service, in String offHostSecureElement); + boolean unsetOffHostForService(int userHandle, in ComponentName service); AidGroup getAidGroupForService(int userHandle, in ComponentName service, String category); boolean removeAidGroupForService(int userHandle, in ComponentName service, String category); List<ApduServiceInfo> getServices(int userHandle, in String category); diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 21fed48189eb..e55e0364f5d4 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -16,6 +16,7 @@ package android.nfc; +import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; @@ -42,7 +43,9 @@ import android.os.ServiceManager; import android.util.Log; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; /** * Represents the local NFC adapter. @@ -322,6 +325,7 @@ public final class NfcAdapter { // Guarded by NfcAdapter.class static boolean sIsInitialized = false; static boolean sHasNfcFeature; + static boolean sHasBeamFeature; // Final after first constructor, except for // attemptDeadServiceRecovery() when NFC crashes - we accept a best effort @@ -369,7 +373,9 @@ public final class NfcAdapter { * A callback to be invoked when the system successfully delivers your {@link NdefMessage} * to another device. * @see #setOnNdefPushCompleteCallback + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public interface OnNdefPushCompleteCallback { /** * Called on successful NDEF push. @@ -392,7 +398,9 @@ public final class NfcAdapter { * content currently visible to the user. Alternatively, you can call {@link * #setNdefPushMessage setNdefPushMessage()} if the {@link NdefMessage} always contains the * same data. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public interface CreateNdefMessageCallback { /** * Called to provide a {@link NdefMessage} to push. @@ -418,7 +426,10 @@ public final class NfcAdapter { } - // TODO javadoc + /** + * @deprecated this feature is deprecated. + */ + @java.lang.Deprecated public interface CreateBeamUrisCallback { public Uri[] createBeamUris(NfcEvent event); } @@ -446,6 +457,25 @@ public final class NfcAdapter { public boolean onUnlockAttempted(Tag tag); } + /** + * Helper to check if this device has FEATURE_NFC_BEAM, but without using + * a context. + * Equivalent to + * context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC_BEAM) + */ + private static boolean hasBeamFeature() { + IPackageManager pm = ActivityThread.getPackageManager(); + if (pm == null) { + Log.e(TAG, "Cannot get package manager, assuming no Android Beam feature"); + return false; + } + try { + return pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM, 0); + } catch (RemoteException e) { + Log.e(TAG, "Package manager query failed, assuming no Android Beam feature", e); + return false; + } + } /** * Helper to check if this device has FEATURE_NFC, but without using @@ -488,6 +518,35 @@ public final class NfcAdapter { } /** + * Return list of Secure Elements which support off host card emulation. + * + * @return List<String> containing secure elements on the device which supports + * off host card emulation. eSE for Embedded secure element, + * SIM for UICC and so on. + */ + public @NonNull List<String> getSupportedOffHostSecureElements() { + List<String> offHostSE = new ArrayList<String>(); + IPackageManager pm = ActivityThread.getPackageManager(); + if (pm == null) { + Log.e(TAG, "Cannot get package manager, assuming no off-host CE feature"); + return offHostSE; + } + try { + if (pm.hasSystemFeature(PackageManager.FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC, 0)) { + offHostSE.add("SIM"); + } + if (pm.hasSystemFeature(PackageManager.FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE, 0)) { + offHostSE.add("eSE"); + } + } catch (RemoteException e) { + Log.e(TAG, "Package manager query failed, assuming no off-host CE feature", e); + offHostSE.clear(); + return offHostSE; + } + return offHostSE; + } + + /** * Returns the NfcAdapter for application context, * or throws if NFC is not available. * @hide @@ -496,6 +555,7 @@ public final class NfcAdapter { public static synchronized NfcAdapter getNfcAdapter(Context context) { if (!sIsInitialized) { sHasNfcFeature = hasNfcFeature(); + sHasBeamFeature = hasBeamFeature(); boolean hasHceFeature = hasNfcHceFeature(); /* is this device meant to have NFC */ if (!sHasNfcFeature && !hasHceFeature) { @@ -921,12 +981,17 @@ public final class NfcAdapter { * @param uris an array of Uri(s) to push over Android Beam * @param activity activity for which the Uri(s) will be pushed * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public void setBeamPushUris(Uri[] uris, Activity activity) { synchronized (NfcAdapter.class) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return; + } } if (activity == null) { throw new NullPointerException("activity cannot be null"); @@ -1003,12 +1068,17 @@ public final class NfcAdapter { * @param callback callback, or null to disable * @param activity activity for which the Uri(s) will be pushed * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public void setBeamPushUrisCallback(CreateBeamUrisCallback callback, Activity activity) { synchronized (NfcAdapter.class) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return; + } } if (activity == null) { throw new NullPointerException("activity cannot be null"); @@ -1087,13 +1157,18 @@ public final class NfcAdapter { * to only register one at a time, and to do so in that activity's * {@link Activity#onCreate} * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public void setNdefPushMessage(NdefMessage message, Activity activity, Activity ... activities) { synchronized (NfcAdapter.class) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return; + } } int targetSdkVersion = getSdkVersion(); try { @@ -1200,13 +1275,18 @@ public final class NfcAdapter { * to only register one at a time, and to do so in that activity's * {@link Activity#onCreate} * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public void setNdefPushMessageCallback(CreateNdefMessageCallback callback, Activity activity, Activity ... activities) { synchronized (NfcAdapter.class) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return; + } } int targetSdkVersion = getSdkVersion(); try { @@ -1281,13 +1361,18 @@ public final class NfcAdapter { * to only register one at a time, and to do so in that activity's * {@link Activity#onCreate} * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public void setOnNdefPushCompleteCallback(OnNdefPushCompleteCallback callback, Activity activity, Activity ... activities) { synchronized (NfcAdapter.class) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return; + } } int targetSdkVersion = getSdkVersion(); try { @@ -1492,12 +1577,17 @@ public final class NfcAdapter { * @param activity the current foreground Activity that has registered data to share * @return whether the Beam animation was successfully invoked * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated public boolean invokeBeam(Activity activity) { synchronized (NfcAdapter.class) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return false; + } } if (activity == null) { throw new NullPointerException("activity may not be null."); @@ -1561,6 +1651,9 @@ public final class NfcAdapter { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return; + } } if (activity == null || message == null) { throw new NullPointerException(); @@ -1595,6 +1688,9 @@ public final class NfcAdapter { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return; + } } if (activity == null) { throw new NullPointerException(); @@ -1668,12 +1764,18 @@ public final class NfcAdapter { * @see android.provider.Settings#ACTION_NFCSHARING_SETTINGS * @return true if NDEF Push feature is enabled * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. + * @deprecated this feature is deprecated. */ + @java.lang.Deprecated + public boolean isNdefPushEnabled() { synchronized (NfcAdapter.class) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } + if (!sHasBeamFeature) { + return false; + } } try { return sService.isNdefPushEnabled(); diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java index e8d801c525e9..911ec8430ddd 100644 --- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -18,11 +18,10 @@ package android.nfc.cardemulation; import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; -import android.content.Context; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.content.res.TypedArray; @@ -30,7 +29,6 @@ import android.content.res.XmlResourceParser; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import android.os.ResultReceiver; import android.util.AttributeSet; import android.util.Log; import android.util.Xml; @@ -69,6 +67,18 @@ public final class ApduServiceInfo implements Parcelable { final boolean mOnHost; /** + * Offhost reader name. + * eg: SIM, eSE etc + */ + String mOffHostName; + + /** + * Offhost reader name from manifest file. + * Used for unsetOffHostSecureElement() + */ + final String mStaticOffHostName; + + /** * Mapping from category to static AID group */ @UnsupportedAppUsage @@ -104,15 +114,17 @@ public final class ApduServiceInfo implements Parcelable { * @hide */ @UnsupportedAppUsage - public ApduServiceInfo(ResolveInfo info, boolean onHost, String description, + public ApduServiceInfo(ResolveInfo info, String description, ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups, boolean requiresUnlock, int bannerResource, int uid, - String settingsActivityName) { + String settingsActivityName, String offHost, String staticOffHost) { this.mService = info; this.mDescription = description; this.mStaticAidGroups = new HashMap<String, AidGroup>(); this.mDynamicAidGroups = new HashMap<String, AidGroup>(); - this.mOnHost = onHost; + this.mOffHostName = offHost; + this.mStaticOffHostName = staticOffHost; + this.mOnHost = (offHost == null); this.mRequiresDeviceUnlock = requiresUnlock; for (AidGroup aidGroup : staticAidGroups) { this.mStaticAidGroups.put(aidGroup.category, aidGroup); @@ -174,6 +186,8 @@ public final class ApduServiceInfo implements Parcelable { com.android.internal.R.styleable.HostApduService_apduServiceBanner, -1); mSettingsActivityName = sa.getString( com.android.internal.R.styleable.HostApduService_settingsActivity); + mOffHostName = null; + mStaticOffHostName = mOffHostName; sa.recycle(); } else { TypedArray sa = res.obtainAttributes(attrs, @@ -186,6 +200,16 @@ public final class ApduServiceInfo implements Parcelable { com.android.internal.R.styleable.OffHostApduService_apduServiceBanner, -1); mSettingsActivityName = sa.getString( com.android.internal.R.styleable.HostApduService_settingsActivity); + mOffHostName = sa.getString( + com.android.internal.R.styleable.OffHostApduService_secureElementName); + if (mOffHostName != null) { + if (mOffHostName.equals("eSE")) { + mOffHostName = "eSE1"; + } else if (mOffHostName.equals("SIM")) { + mOffHostName = "SIM1"; + } + } + mStaticOffHostName = mOffHostName; sa.recycle(); } @@ -289,6 +313,10 @@ public final class ApduServiceInfo implements Parcelable { mService.serviceInfo.name); } + public String getOffHostSecureElement() { + return mOffHostName; + } + /** * Returns a consolidated list of AIDs from the AID groups * registered by this service. Note that if a service has both @@ -404,6 +432,20 @@ public final class ApduServiceInfo implements Parcelable { mDynamicAidGroups.put(aidGroup.getCategory(), aidGroup); } + @UnsupportedAppUsage + public void setOffHostSecureElement(String offHost) { + mOffHostName = offHost; + } + + /** + * Resets the off host Secure Element to statically defined + * by the service in the manifest file. + */ + @UnsupportedAppUsage + public void unsetOffHostSecureElement() { + mOffHostName = mStaticOffHostName; + } + public CharSequence loadLabel(PackageManager pm) { return mService.loadLabel(pm); } @@ -481,6 +523,8 @@ public final class ApduServiceInfo implements Parcelable { mService.writeToParcel(dest, flags); dest.writeString(mDescription); dest.writeInt(mOnHost ? 1 : 0); + dest.writeString(mOffHostName); + dest.writeString(mStaticOffHostName); dest.writeInt(mStaticAidGroups.size()); if (mStaticAidGroups.size() > 0) { dest.writeTypedList(new ArrayList<AidGroup>(mStaticAidGroups.values())); @@ -503,6 +547,8 @@ public final class ApduServiceInfo implements Parcelable { ResolveInfo info = ResolveInfo.CREATOR.createFromParcel(source); String description = source.readString(); boolean onHost = source.readInt() != 0; + String offHostName = source.readString(); + String staticOffHostName = source.readString(); ArrayList<AidGroup> staticAidGroups = new ArrayList<AidGroup>(); int numStaticGroups = source.readInt(); if (numStaticGroups > 0) { @@ -517,9 +563,9 @@ public final class ApduServiceInfo implements Parcelable { int bannerResource = source.readInt(); int uid = source.readInt(); String settingsActivityName = source.readString(); - return new ApduServiceInfo(info, onHost, description, staticAidGroups, + return new ApduServiceInfo(info, description, staticAidGroups, dynamicAidGroups, requiresUnlock, bannerResource, uid, - settingsActivityName); + settingsActivityName, offHostName, staticOffHostName); } @Override @@ -531,6 +577,14 @@ public final class ApduServiceInfo implements Parcelable { public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println(" " + getComponent() + " (Description: " + getDescription() + ")"); + if (mOnHost) { + pw.println(" On Host Service"); + } else { + pw.println(" Off-host Service"); + pw.println(" " + "Current off-host SE" + mOffHostName + + " static off-host: " + mOffHostName); + } + pw.println(" Static off-host Secure Element:"); pw.println(" Static AID groups:"); for (AidGroup group : mStaticAidGroups.values()) { pw.println(" Category: " + group.category); diff --git a/core/java/android/nfc/cardemulation/CardEmulation.java b/core/java/android/nfc/cardemulation/CardEmulation.java index 15d02f2e5ddf..01932abfaa9b 100644 --- a/core/java/android/nfc/cardemulation/CardEmulation.java +++ b/core/java/android/nfc/cardemulation/CardEmulation.java @@ -27,7 +27,6 @@ import android.content.pm.PackageManager; import android.nfc.INfcCardEmulation; import android.nfc.NfcAdapter; import android.os.RemoteException; -import android.os.UserHandle; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; import android.util.Log; @@ -345,6 +344,108 @@ public final class CardEmulation { } /** + * Unsets the off-host Secure Element for the given service. + * + * <p>Note that this will only remove Secure Element that was dynamically + * set using the {@link #setOffHostForService(ComponentName, String)} + * and resets it to a value that was statically assigned using manifest. + * + * <p>Note that you can only unset off-host SE for a service that + * is running under the same UID as the caller of this API. Typically + * this means you need to call this from the same + * package as the service itself, though UIDs can also + * be shared between packages using shared UIDs. + * + * @param service The component name of the service + * @return whether the registration was successful. + */ + public boolean unsetOffHostForService(ComponentName service) { + NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mContext); + if (adapter == null) { + return false; + } + + try { + return sService.unsetOffHostForService(mContext.getUserId(), service); + } catch (RemoteException e) { + // Try one more time + recoverService(); + if (sService == null) { + Log.e(TAG, "Failed to recover CardEmulationService."); + return false; + } + try { + return sService.unsetOffHostForService(mContext.getUserId(), service); + } catch (RemoteException ee) { + Log.e(TAG, "Failed to reach CardEmulationService."); + return false; + } + } + } + + /** + * Sets the off-host Secure Element for the given service. + * + * <p>If off-host SE was initially set (either statically + * through the manifest, or dynamically by using this API), + * it will be replaced with this one. All AIDs registered by + * this service will be re-routed to this Secure Element if + * successful. + * + * <p>Note that you can only set off-host SE for a service that + * is running under the same UID as the caller of this API. Typically + * this means you need to call this from the same + * package as the service itself, though UIDs can also + * be shared between packages using shared UIDs. + * + * <p>Registeration will be successful only if the Secure Element + * exists on the device. + * + * @param service The component name of the service + * @param offHostSecureElement Secure Element to register the AID to + * @return whether the registration was successful. + */ + public boolean setOffHostForService(ComponentName service, String offHostSecureElement) { + boolean validSecureElement = false; + + NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mContext); + if (adapter == null || offHostSecureElement == null) { + return false; + } + + List<String> validSE = adapter.getSupportedOffHostSecureElements(); + if ((offHostSecureElement.startsWith("eSE") && !validSE.contains("eSE")) + || (offHostSecureElement.startsWith("SIM") && !validSE.contains("SIM"))) { + return false; + } + + if (offHostSecureElement.equals("eSE")) { + offHostSecureElement = "eSE1"; + } else if (offHostSecureElement.equals("SIM")) { + offHostSecureElement = "SIM1"; + } + + try { + return sService.setOffHostForService(mContext.getUserId(), service, + offHostSecureElement); + } catch (RemoteException e) { + // Try one more time + recoverService(); + if (sService == null) { + Log.e(TAG, "Failed to recover CardEmulationService."); + return false; + } + try { + return sService.setOffHostForService(mContext.getUserId(), service, + offHostSecureElement); + } catch (RemoteException ee) { + Log.e(TAG, "Failed to reach CardEmulationService."); + return false; + } + } + } + + /** * Retrieves the currently registered AIDs for the specified * category for a service. * diff --git a/core/java/android/os/AppZygote.java b/core/java/android/os/AppZygote.java new file mode 100644 index 000000000000..40cbaf75c02d --- /dev/null +++ b/core/java/android/os/AppZygote.java @@ -0,0 +1,119 @@ +/* + * 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.os; + +import android.content.pm.ApplicationInfo; +import android.util.Log; + +import com.android.internal.annotations.GuardedBy; + +/** + * AppZygote is responsible for interfacing with an application-specific zygote. + * + * Application zygotes can pre-load app-specific code and data, and this interface can + * be used to spawn isolated services from such an application zygote. + * + * Note that we'll have only one instance of this per application / uid combination. + * + * @hide + */ +public class AppZygote { + private static final String LOG_TAG = "AppZygote"; + + private final int mZygoteUid; + + private final Object mLock = new Object(); + + /** + * Instance that maintains the socket connection to the zygote. This is {@code null} if the + * zygote is not running or is not connected. + */ + @GuardedBy("mLock") + private ChildZygoteProcess mZygote; + + private final ApplicationInfo mAppInfo; + + public AppZygote(ApplicationInfo appInfo, int zygoteUid) { + mAppInfo = appInfo; + mZygoteUid = zygoteUid; + } + + /** + * Returns the zygote process associated with this app zygote. + * Creates the process if it's not already running. + */ + public ChildZygoteProcess getProcess() { + synchronized (mLock) { + if (mZygote != null) return mZygote; + + connectToZygoteIfNeededLocked(); + return mZygote; + } + } + + /** + * Stops the Zygote and kills the zygote process. + */ + public void stopZygote() { + synchronized (mLock) { + stopZygoteLocked(); + } + } + + public ApplicationInfo getAppInfo() { + return mAppInfo; + } + + @GuardedBy("mLock") + private void stopZygoteLocked() { + if (mZygote != null) { + // Close the connection and kill the zygote process. This will not cause + // child processes to be killed by itself. + mZygote.close(); + Process.killProcess(mZygote.getPid()); + mZygote = null; + } + } + + @GuardedBy("mLock") + private void connectToZygoteIfNeededLocked() { + String abi = mAppInfo.primaryCpuAbi != null ? mAppInfo.primaryCpuAbi : + Build.SUPPORTED_ABIS[0]; + try { + mZygote = Process.zygoteProcess.startChildZygote( + "com.android.internal.os.AppZygoteInit", + mAppInfo.processName + "_zygote", + mZygoteUid, + mZygoteUid, + null, // gids + 0, // runtimeFlags + "app_zygote", // seInfo + abi, // abi + abi, // acceptedAbiList + null); // instructionSet + + ZygoteProcess.waitForConnectionToZygote(mZygote.getPrimarySocketAddress()); + // preload application code in the zygote + Log.i(LOG_TAG, "Starting application preload."); + mZygote.preloadApp(mAppInfo, abi); + Log.i(LOG_TAG, "Application preload done."); + } catch (Exception e) { + Log.e(LOG_TAG, "Error connecting to app zygote", e); + stopZygoteLocked(); + } + } +} diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 8904ee61e2e3..a236300a56cf 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -382,6 +382,11 @@ public class Environment { } /** {@hide} */ + public static File getDataStagingDirectory(String volumeUuid) { + return new File(getDataDirectory(volumeUuid), "staging"); + } + + /** {@hide} */ public static File getDataUserCeDirectory(String volumeUuid) { return new File(getDataDirectory(volumeUuid), "user"); } diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index fdadfbe0ba78..d9793097fc3a 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -482,7 +482,7 @@ public class GraphicsEnvironment { String applicationPackageName = context.getPackageName(); String devOptInApplicationName = coreSettings.getString( - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); + Settings.Global.GUP_DEV_OPT_IN_APPS); boolean devOptIn = applicationPackageName.equals(devOptInApplicationName); boolean whitelisted = onWhitelist(context, driverPackageName, ai.packageName); if (!devOptIn && !whitelisted) { diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 505aec29d438..ee56e3d0ad16 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -111,6 +111,12 @@ public class Process { public static final int NFC_UID = 1027; /** + * Defines the UID/GID for the clatd process. + * @hide + * */ + public static final int CLAT_UID = 1029; + + /** * Defines the UID/GID for the Bluetooth service process. * @hide */ @@ -199,6 +205,24 @@ public class Process { public static final int LAST_APPLICATION_UID = 19999; /** + * First uid used for fully isolated sandboxed processes spawned from an app zygote + * @hide + */ + public static final int FIRST_APP_ZYGOTE_ISOLATED_UID = 90000; + + /** + * Number of UIDs we allocate per application zygote + * @hide + */ + public static final int NUM_UIDS_PER_APP_ZYGOTE = 100; + + /** + * Last uid used for fully isolated sandboxed processes spawned from an app zygote + * @hide + */ + public static final int LAST_APP_ZYGOTE_ISOLATED_UID = 98999; + + /** * First uid used for fully isolated sandboxed processes (with no permissions of their own) * @hide */ @@ -644,7 +668,8 @@ public class Process { /** {@hide} */ public static final boolean isIsolated(int uid) { uid = UserHandle.getAppId(uid); - return uid >= FIRST_ISOLATED_UID && uid <= LAST_ISOLATED_UID; + return (uid >= FIRST_ISOLATED_UID && uid <= LAST_ISOLATED_UID) + || (uid >= FIRST_APP_ZYGOTE_ISOLATED_UID && uid <= LAST_APP_ZYGOTE_ISOLATED_UID); } /** diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index f8feb7b4a693..ad8a4d5645bc 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -138,8 +138,7 @@ public final class UserHandle implements Parcelable { */ public static boolean isIsolated(int uid) { if (uid > 0) { - final int appId = getAppId(uid); - return appId >= Process.FIRST_ISOLATED_UID && appId <= Process.LAST_ISOLATED_UID; + return Process.isIsolated(uid); } else { return false; } @@ -294,9 +293,14 @@ public final class UserHandle implements Parcelable { sb.append('u'); sb.append(getUserId(uid)); final int appId = getAppId(uid); - if (appId >= Process.FIRST_ISOLATED_UID && appId <= Process.LAST_ISOLATED_UID) { - sb.append('i'); - sb.append(appId - Process.FIRST_ISOLATED_UID); + if (isIsolated(appId)) { + if (appId > Process.FIRST_ISOLATED_UID) { + sb.append('i'); + sb.append(appId - Process.FIRST_ISOLATED_UID); + } else { + sb.append("ai"); + sb.append(appId - Process.FIRST_APP_ZYGOTE_ISOLATED_UID); + } } else if (appId >= Process.FIRST_APPLICATION_UID) { sb.append('a'); sb.append(appId - Process.FIRST_APPLICATION_UID); @@ -330,9 +334,14 @@ public final class UserHandle implements Parcelable { pw.print('u'); pw.print(getUserId(uid)); final int appId = getAppId(uid); - if (appId >= Process.FIRST_ISOLATED_UID && appId <= Process.LAST_ISOLATED_UID) { - pw.print('i'); - pw.print(appId - Process.FIRST_ISOLATED_UID); + if (isIsolated(appId)) { + if (appId > Process.FIRST_ISOLATED_UID) { + pw.print('i'); + pw.print(appId - Process.FIRST_ISOLATED_UID); + } else { + pw.print("ai"); + pw.print(appId - Process.FIRST_APP_ZYGOTE_ISOLATED_UID); + } } else if (appId >= Process.FIRST_APPLICATION_UID) { pw.print('a'); pw.print(appId - Process.FIRST_APPLICATION_UID); diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index f136cd6699a7..251c5eebadc4 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -18,6 +18,7 @@ package android.os; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.pm.ApplicationInfo; import android.net.LocalSocket; import android.net.LocalSocketAddress; import android.util.Log; @@ -34,6 +35,7 @@ import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; +import java.util.Base64; import java.util.Collections; import java.util.List; import java.util.UUID; @@ -673,6 +675,36 @@ public class ZygoteProcess { } /** + * Instructs the zygote to pre-load the application code for the given Application. + * Only the app zygote supports this function. + * TODO preloadPackageForAbi() can probably be removed and the callers an use this instead. + */ + public boolean preloadApp(ApplicationInfo appInfo, String abi) throws ZygoteStartFailedEx, + IOException { + synchronized (mLock) { + ZygoteState state = openZygoteSocketIfNeeded(abi); + state.writer.write("2"); + state.writer.newLine(); + + state.writer.write("--preload-app"); + state.writer.newLine(); + + // Zygote args needs to be strings, so in order to pass ApplicationInfo, + // write it to a Parcel, and base64 the raw Parcel bytes to the other side. + Parcel parcel = Parcel.obtain(); + appInfo.writeToParcel(parcel, 0 /* flags */); + String encodedParcelData = Base64.getEncoder().encodeToString(parcel.marshall()); + parcel.recycle(); + state.writer.write(encodedParcelData); + state.writer.newLine(); + + state.writer.flush(); + + return (state.inputStream.readInt() == 0); + } + } + + /** * Instructs the zygote to pre-load the classes and native libraries at the given paths * for the specified abi. Not all zygotes support this function. */ @@ -763,6 +795,20 @@ public class ZygoteProcess { * secondary zygotes that inherit data from the zygote that this object * communicates with. This returns a new ZygoteProcess representing a connection * to the newly created zygote. Throws an exception if the zygote cannot be started. + * + * @param processClass The class to use as the child zygote's main entry + * point. + * @param niceName A more readable name to use for the process. + * @param uid The user-id under which the child zygote will run. + * @param gid The group-id under which the child zygote will run. + * @param gids Additional group-ids associated with the child zygote process. + * @param runtimeFlags Additional flags. + * @param seInfo null-ok SELinux information for the child zygote process. + * @param abi non-null the ABI of the child zygote + * @param acceptedAbiList ABIs this child zygote will accept connections for; this + * may be different from <code>abi</code> in case the children + * spawned from this Zygote only communicate using ABI-safe methods. + * @param instructionSet null-ok the instruction set to use. */ public ChildZygoteProcess startChildZygote(final String processClass, final String niceName, @@ -770,12 +816,14 @@ public class ZygoteProcess { int runtimeFlags, String seInfo, String abi, + String acceptedAbiList, String instructionSet) { // Create an unguessable address in the global abstract namespace. final LocalSocketAddress serverAddress = new LocalSocketAddress( processClass + "/" + UUID.randomUUID().toString()); - final String[] extraArgs = {Zygote.CHILD_ZYGOTE_SOCKET_NAME_ARG + serverAddress.getName()}; + final String[] extraArgs = {Zygote.CHILD_ZYGOTE_SOCKET_NAME_ARG + serverAddress.getName(), + Zygote.CHILD_ZYGOTE_ABI_LIST_ARG + acceptedAbiList}; Process.ProcessStartResult result; try { diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 9594a713a506..735f4f253594 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1540,6 +1540,7 @@ public class StorageManager { } /** {@hide} */ + @SystemApi @TestApi public static boolean hasIsolatedStorage() { // Prefer to use snapshot for current boot when available diff --git a/core/java/android/permission/IRuntimePermissionPresenter.aidl b/core/java/android/permission/IPermissionController.aidl index e95428ab2b02..38951d5466c7 100644 --- a/core/java/android/permission/IRuntimePermissionPresenter.aidl +++ b/core/java/android/permission/IPermissionController.aidl @@ -19,11 +19,11 @@ package android.permission; import android.os.RemoteCallback; /** - * Interface for communication with the permission presenter service. + * Interface for system apps to communication with the permission controller. * * @hide */ -oneway interface IRuntimePermissionPresenter { +oneway interface IPermissionController { void getAppPermissions(String packageName, in RemoteCallback callback); void revokeRuntimePermission(String packageName, String permissionName); void countPermissionApps(in List<String> permissionNames, boolean countOnlyGranted, diff --git a/core/java/android/permission/RuntimePermissionPresenter.java b/core/java/android/permission/PermissionControllerManager.java index c607e3fb309c..66e8666a8a70 100644 --- a/core/java/android/permission/RuntimePermissionPresenter.java +++ b/core/java/android/permission/PermissionControllerManager.java @@ -16,13 +16,16 @@ package android.permission; -import static android.permission.RuntimePermissionPresenterService.SERVICE_INTERFACE; +import static android.permission.PermissionControllerService.SERVICE_INTERFACE; import static com.android.internal.util.Preconditions.checkCollectionElementsNotNull; import static com.android.internal.util.Preconditions.checkNotNull; +import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; +import android.annotation.SystemService; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -34,7 +37,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.util.Log; -import com.android.internal.annotations.GuardedBy; import com.android.internal.infra.AbstractMultiplePendingRequestsRemoteService; import com.android.internal.infra.AbstractRemoteService; @@ -42,29 +44,24 @@ import java.util.Collections; import java.util.List; /** - * This class provides information about runtime permissions for a specific - * app or all apps. This information is dedicated for presentation purposes - * and does not necessarily reflect the individual permissions requested/ - * granted to an app as the platform may be grouping permissions to improve - * presentation and help the user make an informed choice. For example, all - * runtime permissions in the same permission group may be presented as a - * single permission in the UI. + * Interface for communicating with the permission controller from system apps. All UI operations + * regarding permissions and any changes to the permission state should flow through this + * interface. * * @hide */ -public final class RuntimePermissionPresenter { - private static final String TAG = "RuntimePermPresenter"; +@SystemService(Context.PERMISSION_CONTROLLER_SERVICE) +public final class PermissionControllerManager { + private static final String TAG = PermissionControllerManager.class.getSimpleName(); /** * The key for retrieving the result from the returned bundle. - * - * @hide */ public static final String KEY_RESULT = - "android.permission.RuntimePermissionPresenter.key.result"; + "android.permission.PermissionControllerManager.key.result"; /** - * Listener for delivering the result of {@link #getAppPermissions}. + * Callback for delivering the result of {@link #getAppPermissions}. */ public interface OnGetAppPermissionResultCallback { /** @@ -77,7 +74,7 @@ public final class RuntimePermissionPresenter { } /** - * Listener for delivering the result of {@link #countPermissionApps}. + * Callback for delivering the result of {@link #countPermissionApps}. */ public interface OnCountPermissionAppsResultCallback { /** @@ -89,29 +86,9 @@ public final class RuntimePermissionPresenter { void onCountPermissionApps(int numApps); } - private static final Object sLock = new Object(); - - @GuardedBy("sLock") - private static RuntimePermissionPresenter sInstance; - private final RemoteService mRemoteService; - /** - * Gets the singleton runtime permission presenter. - * - * @param context Context for accessing resources. - * @return The singleton instance. - */ - public static RuntimePermissionPresenter getInstance(@NonNull Context context) { - synchronized (sLock) { - if (sInstance == null) { - sInstance = new RuntimePermissionPresenter(context.getApplicationContext()); - } - return sInstance; - } - } - - private RuntimePermissionPresenter(@NonNull Context context) { + public PermissionControllerManager(@NonNull Context context) { Intent intent = new Intent(SERVICE_INTERFACE); intent.setPackage(context.getPackageManager().getPermissionControllerPackageName()); ResolveInfo serviceInfo = context.getPackageManager().resolveService(intent, 0); @@ -127,6 +104,7 @@ public final class RuntimePermissionPresenter { * @param callback Callback to receive the result. * @param handler Handler on which to invoke the callback. */ + @RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS) public void getAppPermissions(@NonNull String packageName, @NonNull OnGetAppPermissionResultCallback callback, @Nullable Handler handler) { checkNotNull(packageName); @@ -142,6 +120,7 @@ public final class RuntimePermissionPresenter { * @param packageName The package for which to revoke * @param permissionName The permission to revoke */ + @RequiresPermission(Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public void revokeRuntimePermission(@NonNull String packageName, @NonNull String permissionName) { checkNotNull(packageName); @@ -160,6 +139,7 @@ public final class RuntimePermissionPresenter { * @param callback Callback to receive the result * @param handler Handler on which to invoke the callback */ + @RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS) public void countPermissionApps(@NonNull List<String> permissionNames, boolean countOnlyGranted, boolean countSystem, @NonNull OnCountPermissionAppsResultCallback callback, @Nullable Handler handler) { @@ -175,8 +155,7 @@ public final class RuntimePermissionPresenter { * A connection to the remote service */ static final class RemoteService extends - AbstractMultiplePendingRequestsRemoteService<RemoteService, - IRuntimePermissionPresenter> { + AbstractMultiplePendingRequestsRemoteService<RemoteService, IPermissionController> { private static final long UNBIND_TIMEOUT_MILLIS = 10000; private static final long MESSAGE_TIMEOUT_MILLIS = 30000; @@ -200,9 +179,8 @@ public final class RuntimePermissionPresenter { } @Override - protected @NonNull IRuntimePermissionPresenter getServiceInterface( - @NonNull IBinder binder) { - return IRuntimePermissionPresenter.Stub.asInterface(binder); + protected @NonNull IPermissionController getServiceInterface(@NonNull IBinder binder) { + return IPermissionController.Stub.asInterface(binder); } @Override @@ -217,13 +195,12 @@ public final class RuntimePermissionPresenter { @Override public void scheduleRequest(@NonNull PendingRequest<RemoteService, - IRuntimePermissionPresenter> pendingRequest) { + IPermissionController> pendingRequest) { super.scheduleRequest(pendingRequest); } @Override - public void scheduleAsyncRequest( - @NonNull AsyncRequest<IRuntimePermissionPresenter> request) { + public void scheduleAsyncRequest(@NonNull AsyncRequest<IPermissionController> request) { super.scheduleAsyncRequest(request); } } @@ -232,7 +209,7 @@ public final class RuntimePermissionPresenter { * Request for {@link #getAppPermissions} */ private static final class PendingGetAppPermissionRequest extends - AbstractRemoteService.PendingRequest<RemoteService, IRuntimePermissionPresenter> { + AbstractRemoteService.PendingRequest<RemoteService, IPermissionController> { private final @NonNull String mPackageName; private final @NonNull OnGetAppPermissionResultCallback mCallback; @@ -282,7 +259,7 @@ public final class RuntimePermissionPresenter { * Request for {@link #revokeRuntimePermission} */ private static final class PendingRevokeAppPermissionRequest - implements AbstractRemoteService.AsyncRequest<IRuntimePermissionPresenter> { + implements AbstractRemoteService.AsyncRequest<IPermissionController> { private final @NonNull String mPackageName; private final @NonNull String mPermissionName; @@ -293,7 +270,7 @@ public final class RuntimePermissionPresenter { } @Override - public void run(IRuntimePermissionPresenter remoteInterface) { + public void run(IPermissionController remoteInterface) { try { remoteInterface.revokeRuntimePermission(mPackageName, mPermissionName); } catch (RemoteException e) { @@ -306,7 +283,7 @@ public final class RuntimePermissionPresenter { * Request for {@link #countPermissionApps} */ private static final class PendingCountPermissionAppsRequest extends - AbstractRemoteService.PendingRequest<RemoteService, IRuntimePermissionPresenter> { + AbstractRemoteService.PendingRequest<RemoteService, IPermissionController> { private final @NonNull List<String> mPermissionNames; private final @NonNull OnCountPermissionAppsResultCallback mCallback; private final boolean mCountOnlyGranted; diff --git a/core/java/android/permission/RuntimePermissionPresenterService.java b/core/java/android/permission/PermissionControllerService.java index 81ec7bed19af..5dad07178e53 100644 --- a/core/java/android/permission/RuntimePermissionPresenterService.java +++ b/core/java/android/permission/PermissionControllerService.java @@ -20,6 +20,7 @@ import static com.android.internal.util.Preconditions.checkCollectionElementsNot import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage; +import android.Manifest; import android.annotation.NonNull; import android.annotation.SystemApi; import android.app.Service; @@ -33,26 +34,21 @@ import android.os.RemoteCallback; import java.util.List; /** - * This service presents information regarding runtime permissions that is - * used for presenting them in the UI. Runtime permissions are presented as - * a single permission in the UI but may be composed of several individual - * permissions. + * This service is meant to be implemented by the app controlling permissions. * - * @see RuntimePermissionPresenter - * @see RuntimePermissionPresentationInfo + * @see PermissionController * * @hide */ @SystemApi -public abstract class RuntimePermissionPresenterService extends Service { +public abstract class PermissionControllerService extends Service { /** * The {@link Intent} action that must be declared as handled by a service * in its manifest for the system to recognize it as a runtime permission * presenter service. */ - public static final String SERVICE_INTERFACE = - "android.permission.RuntimePermissionPresenterService"; + public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService"; // No need for locking - always set first and never modified private Handler mHandler; @@ -96,16 +92,17 @@ public abstract class RuntimePermissionPresenterService extends Service { @Override public final IBinder onBind(Intent intent) { - return new IRuntimePermissionPresenter.Stub() { + return new IPermissionController.Stub() { @Override public void getAppPermissions(String packageName, RemoteCallback callback) { checkNotNull(packageName, "packageName"); checkNotNull(callback, "callback"); + enforceCallingPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS, null); + mHandler.sendMessage( - obtainMessage( - RuntimePermissionPresenterService::getAppPermissions, - RuntimePermissionPresenterService.this, packageName, callback)); + obtainMessage(PermissionControllerService::getAppPermissions, + PermissionControllerService.this, packageName, callback)); } @Override @@ -113,11 +110,11 @@ public abstract class RuntimePermissionPresenterService extends Service { checkNotNull(packageName, "packageName"); checkNotNull(permissionName, "permissionName"); + enforceCallingPermission(Manifest.permission.REVOKE_RUNTIME_PERMISSIONS, null); + mHandler.sendMessage( - obtainMessage( - RuntimePermissionPresenterService::onRevokeRuntimePermission, - RuntimePermissionPresenterService.this, packageName, - permissionName)); + obtainMessage(PermissionControllerService::onRevokeRuntimePermission, + PermissionControllerService.this, packageName, permissionName)); } @Override @@ -126,11 +123,12 @@ public abstract class RuntimePermissionPresenterService extends Service { checkCollectionElementsNotNull(permissionNames, "permissionNames"); checkNotNull(callback, "callback"); + enforceCallingPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS, null); + mHandler.sendMessage( - obtainMessage( - RuntimePermissionPresenterService::countPermissionApps, - RuntimePermissionPresenterService.this, permissionNames, - countOnlyGranted, countSystem, callback)); + obtainMessage(PermissionControllerService::countPermissionApps, + PermissionControllerService.this, permissionNames, countOnlyGranted, + countSystem, callback)); } }; } @@ -139,7 +137,7 @@ public abstract class RuntimePermissionPresenterService extends Service { List<RuntimePermissionPresentationInfo> permissions = onGetAppPermissions(packageName); if (permissions != null && !permissions.isEmpty()) { Bundle result = new Bundle(); - result.putParcelableList(RuntimePermissionPresenter.KEY_RESULT, permissions); + result.putParcelableList(PermissionControllerManager.KEY_RESULT, permissions); callback.sendResult(result); } else { callback.sendResult(null); @@ -151,7 +149,7 @@ public abstract class RuntimePermissionPresenterService extends Service { int numApps = onCountPermissionApps(permissionNames, countOnlyGranted, countSystem); Bundle result = new Bundle(); - result.putInt(RuntimePermissionPresenter.KEY_RESULT, numApps); + result.putInt(PermissionControllerManager.KEY_RESULT, numApps); callback.sendResult(result); } } diff --git a/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java b/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java index 2b3f0f525904..8d568c84b915 100644 --- a/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java +++ b/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java @@ -30,6 +30,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.RemoteCallback; +import android.permission.PermissionControllerService; import java.util.List; @@ -43,7 +44,7 @@ import java.util.List; * * @hide * - * @deprecated use {@link android.permission.RuntimePermissionPresenterService} instead + * @deprecated use {@link PermissionControllerService} instead */ @Deprecated @SystemApi diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index e5fd29cc09b1..b348da45e2d6 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -409,6 +409,15 @@ public final class Downloads { public static final String COLUMN_MEDIAPROVIDER_URI = "mediaprovider_uri"; /** + * Similar to {@link #COLUMN_MEDIAPROVIDER_URI}, except this cannot be updated/queried + * by apps and will be the source of truth when updating/deleting download entries in + * MediaProvider database. + * + * <P>Type: TEXT</P> + */ + public static final String COLUMN_MEDIASTORE_URI = "mediastore_uri"; + + /** * The column that is used to remember whether the media scanner was invoked. * It can take the values: null or 0(not scanned), 1(scanned), 2 (not scannable). * <P>Type: TEXT</P> diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index c4e2b1299fc2..cdbc9790c952 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -17,6 +17,7 @@ package android.provider; import android.annotation.BytesLong; +import android.annotation.DurationMillisLong; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; @@ -55,6 +56,7 @@ import android.os.storage.StorageVolume; import android.os.storage.VolumeInfo; import android.service.media.CameraPrewarmService; import android.text.TextUtils; +import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; @@ -131,6 +133,8 @@ public final class MediaStore { /** {@hide} */ public static final String PARAM_INCLUDE_PENDING = "includePending"; /** {@hide} */ + public static final String PARAM_INCLUDE_TRASHED = "includeTrashed"; + /** {@hide} */ public static final String PARAM_PROGRESS = "progress"; /** {@hide} */ public static final String PARAM_REQUIRE_ORIGINAL = "requireOriginal"; @@ -485,12 +489,29 @@ public final class MediaStore { * By default no pending items are returned. * * @see MediaColumns#IS_PENDING + * @see MediaStore#setIncludePending(Uri) + * @see MediaStore#createPending(Context, PendingParams) */ public static @NonNull Uri setIncludePending(@NonNull Uri uri) { return uri.buildUpon().appendQueryParameter(PARAM_INCLUDE_PENDING, "1").build(); } /** + * Update the given {@link Uri} to also include any trashed media items from + * calls such as + * {@link ContentResolver#query(Uri, String[], Bundle, CancellationSignal)}. + * By default no trashed items are returned. + * + * @see MediaColumns#IS_TRASHED + * @see MediaStore#setIncludeTrashed(Uri) + * @see MediaStore#trash(Context, Uri) + * @see MediaStore#untrash(Context, Uri) + */ + public static @NonNull Uri setIncludeTrashed(@NonNull Uri uri) { + return uri.buildUpon().appendQueryParameter(PARAM_INCLUDE_TRASHED, "1").build(); + } + + /** * Update the given {@link Uri} to indicate that the caller requires the * original file contents when calling * {@link ContentResolver#openFileDescriptor(Uri, String)}. @@ -516,6 +537,9 @@ public final class MediaStore { * * @return token which can be passed to {@link #openPending(Context, Uri)} * to work with this pending item. + * @see MediaColumns#IS_PENDING + * @see MediaStore#setIncludePending(Uri) + * @see MediaStore#createPending(Context, PendingParams) */ public static @NonNull Uri createPending(@NonNull Context context, @NonNull PendingParams params) { @@ -572,6 +596,8 @@ public final class MediaStore { this.insertValues.put(MediaColumns.DATE_ADDED, now); this.insertValues.put(MediaColumns.DATE_MODIFIED, now); this.insertValues.put(MediaColumns.IS_PENDING, 1); + this.insertValues.put(MediaColumns.DATE_EXPIRES, + (System.currentTimeMillis() + DateUtils.DAY_IN_MILLIS) / 1000); } /** @@ -696,6 +722,7 @@ public final class MediaStore { public @NonNull Uri publish() { final ContentValues values = new ContentValues(); values.put(MediaColumns.IS_PENDING, 0); + values.putNull(MediaColumns.DATE_EXPIRES); mContext.getContentResolver().update(mUri, values, null, null); return mUri; } @@ -717,6 +744,67 @@ public final class MediaStore { } /** + * Mark the given item as being "trashed", meaning it should be deleted at + * some point in the future. This is a more gentle operation than simply + * calling {@link ContentResolver#delete(Uri, String, String[])}, which + * would take effect immediately. + * <p> + * This method preserves trashed items for at least 48 hours before erasing + * them, giving the user a chance to untrash the item. + * + * @see MediaColumns#IS_TRASHED + * @see MediaStore#setIncludeTrashed(Uri) + * @see MediaStore#trash(Context, Uri) + * @see MediaStore#untrash(Context, Uri) + */ + public static void trash(@NonNull Context context, @NonNull Uri uri) { + trash(context, uri, 48 * DateUtils.HOUR_IN_MILLIS); + } + + /** + * Mark the given item as being "trashed", meaning it should be deleted at + * some point in the future. This is a more gentle operation than simply + * calling {@link ContentResolver#delete(Uri, String, String[])}, which + * would take effect immediately. + * <p> + * This method preserves trashed items for at least the given timeout before + * erasing them, giving the user a chance to untrash the item. + * + * @see MediaColumns#IS_TRASHED + * @see MediaStore#setIncludeTrashed(Uri) + * @see MediaStore#trash(Context, Uri) + * @see MediaStore#untrash(Context, Uri) + */ + public static void trash(@NonNull Context context, @NonNull Uri uri, + @DurationMillisLong long timeoutMillis) { + if (timeoutMillis < 0) { + throw new IllegalArgumentException(); + } + + final ContentValues values = new ContentValues(); + values.put(MediaColumns.IS_TRASHED, 1); + values.put(MediaColumns.DATE_EXPIRES, + (System.currentTimeMillis() + timeoutMillis) / 1000); + context.getContentResolver().update(uri, values, null, null); + } + + /** + * Mark the given item as being "untrashed", meaning it should no longer be + * deleted as previously requested through {@link #trash(Context, Uri)}. + * + * @see MediaColumns#IS_TRASHED + * @see MediaStore#setIncludeTrashed(Uri) + * @see MediaStore#trash(Context, Uri) + * @see MediaStore#untrash(Context, Uri) + */ + public static void untrash(@NonNull Context context, @NonNull Uri uri) { + final ContentValues values = new ContentValues(); + values.put(MediaColumns.IS_TRASHED, 0); + values.putNull(MediaColumns.DATE_EXPIRES); + context.getContentResolver().update(uri, values, null, null); + } + + /** * Common fields for most MediaProvider tables */ public interface MediaColumns extends BaseColumns { @@ -821,12 +909,34 @@ public final class MediaStore { * <p> * Type: BOOLEAN * + * @see MediaColumns#IS_PENDING + * @see MediaStore#setIncludePending(Uri) * @see MediaStore#createPending(Context, PendingParams) - * @see MediaStore#PARAM_INCLUDE_PENDING */ public static final String IS_PENDING = "is_pending"; /** + * Flag indicating if a media item is trashed. + * <p> + * Type: BOOLEAN + * + * @see MediaColumns#IS_TRASHED + * @see MediaStore#setIncludeTrashed(Uri) + * @see MediaStore#trash(Context, Uri) + * @see MediaStore#untrash(Context, Uri) + */ + public static final String IS_TRASHED = "is_trashed"; + + /** + * The time the file should be considered expired. Units are seconds + * since 1970. Typically only meaningful in the context of + * {@link #IS_PENDING} or {@link #IS_TRASHED}. + * <p> + * Type: INTEGER + */ + public static final String DATE_EXPIRES = "date_expires"; + + /** * The width of the image/video in pixels. */ public static final String WIDTH = "width"; @@ -915,6 +1025,11 @@ public final class MediaStore { return AUTHORITY_URI.buildUpon().appendPath(volumeName).appendPath("dir").build(); } + /** @hide */ + public static final Uri getContentUriForPath(String path) { + return getContentUri(getVolumeNameForPath(path)); + } + /** * Fields for master table for all media files. * Table also contains MediaColumns._ID, DATA, SIZE and DATE_MODIFIED. @@ -1021,6 +1136,13 @@ public final class MediaStore { * Type: TEXT */ String REFERER_URI = "referer_uri"; + + /** + * The description of the download. + * <p> + * Type: Text + */ + String DESCRIPTION = "description"; } /** @@ -1251,18 +1373,32 @@ public final class MediaStore { public static final String MINI_THUMB_MAGIC = "mini_thumb_magic"; /** - * The bucket id of the image. This is a read-only property that - * is automatically computed from the DATA column. - * <P>Type: TEXT</P> + * The primary bucket ID of this media item. This can be useful to + * present the user a first-level clustering of related media items. + * This is a read-only column that is automatically computed. + * <p> + * Type: INTEGER */ public static final String BUCKET_ID = "bucket_id"; /** - * The bucket display name of the image. This is a read-only property that - * is automatically computed from the DATA column. - * <P>Type: TEXT</P> + * The primary bucket display name of this media item. This can be + * useful to present the user a first-level clustering of related + * media items. This is a read-only column that is automatically + * computed. + * <p> + * Type: TEXT */ public static final String BUCKET_DISPLAY_NAME = "bucket_display_name"; + + /** + * The secondary bucket ID of this media item. This can be useful to + * present the user a second-level clustering of related media + * items. This is a read-only column that is automatically computed. + * <p> + * Type: INTEGER + */ + public static final String SECONDARY_BUCKET_ID = "secondary_bucket_id"; } public static final class Media implements ImageColumns { @@ -2500,20 +2636,34 @@ public final class MediaStore { public static final String MINI_THUMB_MAGIC = "mini_thumb_magic"; /** - * The bucket id of the video. This is a read-only property that - * is automatically computed from the DATA column. - * <P>Type: TEXT</P> + * The primary bucket ID of this media item. This can be useful to + * present the user a first-level clustering of related media items. + * This is a read-only column that is automatically computed. + * <p> + * Type: INTEGER */ public static final String BUCKET_ID = "bucket_id"; /** - * The bucket display name of the video. This is a read-only property that - * is automatically computed from the DATA column. - * <P>Type: TEXT</P> + * The primary bucket display name of this media item. This can be + * useful to present the user a first-level clustering of related + * media items. This is a read-only column that is automatically + * computed. + * <p> + * Type: TEXT */ public static final String BUCKET_DISPLAY_NAME = "bucket_display_name"; /** + * The secondary bucket ID of this media item. This can be useful to + * present the user a second-level clustering of related media + * items. This is a read-only column that is automatically computed. + * <p> + * Type: INTEGER + */ + public static final String SECONDARY_BUCKET_ID = "secondary_bucket_id"; + + /** * The bookmark for the video. Time in ms. Represents the location in the video that the * video should start playing at the next time it is opened. If the value is null or * out of the range 0..DURATION-1 then the video should start playing from the diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 65514b6f1872..bb1784af6c85 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11982,11 +11982,16 @@ public final class Settings { "angle_gl_driver_selection_values"; /** - * App that is selected to use updated graphics driver. + * Apps that are selected to use Game Update Package. * @hide */ - public static final String UPDATED_GFX_DRIVER_DEV_OPT_IN_APP = - "updated_gfx_driver_dev_opt_in_app"; + public static final String GUP_DEV_OPT_IN_APPS = "gup_dev_opt_in_apps"; + + /** + * Apps on the black list that are forbidden to useGame Update Package. + * @hide + */ + public static final String GUP_BLACK_LIST = "gup_black_list"; /** * Ordered GPU debug layer list for Vulkan @@ -14070,11 +14075,10 @@ public final class Settings { try { Bundle arg = new Bundle(); arg.putInt(CALL_METHOD_USER_KEY, resolver.getUserId()); - arg.putInt(Settings.CALL_METHOD_RESET_MODE_KEY, resetMode); + arg.putInt(CALL_METHOD_RESET_MODE_KEY, resetMode); if (prefix != null) { arg.putString(Settings.CALL_METHOD_PREFIX_KEY, prefix); } - arg.putInt(CALL_METHOD_RESET_MODE_KEY, resetMode); IContentProvider cp = sProviderHolder.getProvider(resolver); cp.call(resolver.getPackageName(), sProviderHolder.mUri.getAuthority(), CALL_METHOD_RESET_CONFIG, null, arg); diff --git a/core/java/android/view/AccessibilityIterators.java b/core/java/android/view/AccessibilityIterators.java index 9f7560c79166..54cfc00cb5b3 100644 --- a/core/java/android/view/AccessibilityIterators.java +++ b/core/java/android/view/AccessibilityIterators.java @@ -147,6 +147,9 @@ public final class AccessibilityIterators { @Override public void onConfigurationChanged(Configuration globalConfig) { final Locale locale = globalConfig.getLocales().get(0); + if (locale == null) { + return; + } if (!mLocale.equals(locale)) { mLocale = locale; onLocaleChanged(locale); diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java index 3f8f882a869f..885b3e94c593 100644 --- a/core/java/android/view/InsetsState.java +++ b/core/java/android/view/InsetsState.java @@ -250,7 +250,7 @@ public class InsetsState implements Parcelable { } } - static String typeToString(int type) { + public static String typeToString(int type) { switch (type) { case TYPE_TOP_BAR: return "TYPE_TOP_BAR"; diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index be81c06de1af..ffd4156b5bfd 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -784,24 +784,8 @@ public abstract class LayoutInflater { ta.recycle(); } - if (name.equals(TAG_1995)) { - // Let's party like it's 1995! - return new BlinkLayout(context, attrs); - } - try { - View view; - if (mFactory2 != null) { - view = mFactory2.onCreateView(parent, name, context, attrs); - } else if (mFactory != null) { - view = mFactory.onCreateView(name, context, attrs); - } else { - view = null; - } - - if (view == null && mPrivateFactory != null) { - view = mPrivateFactory.onCreateView(parent, name, context, attrs); - } + View view = tryCreateView(parent, name, context, attrs); if (view == null) { final Object lastContext = mConstructorArgs[0]; @@ -836,6 +820,48 @@ public abstract class LayoutInflater { } /** + * Tries to create a view from a tag name using the supplied attribute set. + * + * This method gives the factory provided by {@link LayoutInflater#setFactory} and + * {@link LayoutInflater#setFactory2} a chance to create a view. However, it does not apply all + * of the general view creation logic, and thus may return {@code null} for some tags. This + * method is used by {@link LayoutInflater#inflate} in creating {@code View} objects. + * + * @hide for use by precompiled layouts. + * + * @param parent the parent view, used to inflate layout params + * @param name the name of the XML tag used to define the view + * @param context the inflation context for the view, typically the + * {@code parent} or base layout inflater context + * @param attrs the attribute set for the XML tag used to define the view + */ + @UnsupportedAppUsage(trackingBug = 122360734) + @Nullable + public final View tryCreateView(@Nullable View parent, @NonNull String name, + @NonNull Context context, + @NonNull AttributeSet attrs) { + if (name.equals(TAG_1995)) { + // Let's party like it's 1995! + return new BlinkLayout(context, attrs); + } + + View view; + if (mFactory2 != null) { + view = mFactory2.onCreateView(parent, name, context, attrs); + } else if (mFactory != null) { + view = mFactory.onCreateView(name, context, attrs); + } else { + view = null; + } + + if (view == null && mPrivateFactory != null) { + view = mPrivateFactory.onCreateView(parent, name, context, attrs); + } + + return view; + } + + /** * Recursive method used to inflate internal (non-root) children. This * method calls through to {@link #rInflate} using the parent context as * the inflation context. diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index eec114a2fea7..0b6beba06555 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -166,7 +166,8 @@ public class SurfaceControl implements Parcelable { private static native void nativeSetInputWindowInfo(long transactionObj, long nativeObject, InputWindowHandle handle); - + private static native void nativeTransferTouchFocus(long transactionObj, IBinder fromToken, + IBinder toToken); private final CloseGuard mCloseGuard = CloseGuard.get(); private String mName; @@ -1577,6 +1578,21 @@ public class SurfaceControl implements Parcelable { return this; } + /** + * Transfers touch focus from one window to another. It is possible for multiple windows to + * have touch focus if they support split touch dispatch + * {@link android.view.WindowManager.LayoutParams#FLAG_SPLIT_TOUCH} but this + * method only transfers touch focus of the specified window without affecting + * other windows that may also have touch focus at the same time. + * @param fromToken The token of a window that currently has touch focus. + * @param toToken The token of the window that should receive touch focus in + * place of the first. + */ + public Transaction transferTouchFocus(IBinder fromToken, IBinder toToken) { + nativeTransferTouchFocus(mNativeObject, fromToken, toToken); + return this; + } + @UnsupportedAppUsage public Transaction setMatrix(SurfaceControl sc, float dsdx, float dtdx, float dtdy, float dsdy) { diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java index 9f666a40bef3..46e6882b8643 100644 --- a/core/java/android/view/contentcapture/ContentCaptureSession.java +++ b/core/java/android/view/contentcapture/ContentCaptureSession.java @@ -34,6 +34,7 @@ import dalvik.system.CloseGuard; import java.io.PrintWriter; import java.util.ArrayList; import java.util.UUID; +import java.util.concurrent.atomic.AtomicBoolean; /** * Session used to notify a system-provided Content Capture service about events associated with @@ -41,6 +42,8 @@ import java.util.UUID; */ public abstract class ContentCaptureSession implements AutoCloseable { + private static final String TAG = ContentCaptureSession.class.getSimpleName(); + /** * Used on {@link #notifyViewTextChanged(AutofillId, CharSequence, int)} to indicate that the * @@ -85,11 +88,14 @@ public abstract class ContentCaptureSession implements AutoCloseable { private static final int INITIAL_CHILDREN_CAPACITY = 5; - /** @hide */ - protected final String mTag = getClass().getSimpleName(); - private final CloseGuard mCloseGuard = CloseGuard.get(); + /** + * Guard use to ignore events after it's destroyed. + */ + @NonNull + private final AtomicBoolean mDestroyed = new AtomicBoolean(); + /** @hide */ @Nullable protected final String mId = UUID.randomUUID().toString(); @@ -134,7 +140,7 @@ public abstract class ContentCaptureSession implements AutoCloseable { @NonNull ContentCaptureContext context) { final ContentCaptureSession child = newChild(context); if (DEBUG) { - Log.d(mTag, "createContentCaptureSession(" + context + ": parent=" + mId + ", child= " + Log.d(TAG, "createContentCaptureSession(" + context + ": parent=" + mId + ", child=" + child.mId); } if (mChildren == null) { @@ -157,29 +163,29 @@ public abstract class ContentCaptureSession implements AutoCloseable { * <p>Once destroyed, any new notification will be dropped. */ public final void destroy() { - //TODO(b/111276913): mark it as destroyed so other methods are ignored (and test on CTS) - - //TODO(b/111276913): probably shouldn't check for it - if (!isContentCaptureEnabled()) return; + if (!mDestroyed.compareAndSet(false, true)) { + Log.e(TAG, "destroy(): already destroyed"); + return; + } mCloseGuard.close(); //TODO(b/111276913): check state (for example, how to handle if it's waiting for remote // id) and send it to the cache of batched commands if (VERBOSE) { - Log.v(mTag, "destroy(): state=" + getStateAsString(mState) + ", mId=" + mId); + Log.v(TAG, "destroy(): state=" + getStateAsString(mState) + ", mId=" + mId); } // Finish children first if (mChildren != null) { final int numberChildren = mChildren.size(); - if (VERBOSE) Log.v(mTag, "Destroying " + numberChildren + " children first"); + if (VERBOSE) Log.v(TAG, "Destroying " + numberChildren + " children first"); for (int i = 0; i < numberChildren; i++) { final ContentCaptureSession child = mChildren.get(i); try { child.destroy(); } catch (Exception e) { - Log.w(mTag, "exception destroying child session #" + i + ": " + e); + Log.w(TAG, "exception destroying child session #" + i + ": " + e); } } } @@ -298,14 +304,18 @@ public abstract class ContentCaptureSession implements AutoCloseable { return new ViewNode.ViewStructureImpl(parentId, virtualId); } - abstract boolean isContentCaptureEnabled(); + boolean isContentCaptureEnabled() { + return !mDestroyed.get(); + } @CallSuper void dump(@NonNull String prefix, @NonNull PrintWriter pw) { + pw.print(prefix); pw.print("id: "); pw.println(mId); + pw.print(prefix); pw.print("destroyed: "); pw.println(mDestroyed.get()); if (mChildren != null && !mChildren.isEmpty()) { final String prefix2 = prefix + " "; final int numberChildren = mChildren.size(); - pw.print(prefix); pw.print("number children: "); pw.print(numberChildren); + pw.print(prefix); pw.print("number children: "); pw.println(numberChildren); for (int i = 0; i < numberChildren; i++) { final ContentCaptureSession child = mChildren.get(i); pw.print(prefix); pw.print(i); pw.println(": "); child.dump(prefix2, pw); diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index 92e0187f5b0f..baf4a35f179e 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -63,6 +63,8 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public final class MainContentCaptureSession extends ContentCaptureSession { + private static final String TAG = MainContentCaptureSession.class.getSimpleName(); + /** * Handler message used to flush the buffer. */ @@ -128,9 +130,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession { // Used just for debugging purposes (on dump) private long mNextFlush; - // Lazily created on demand. - private ContentCaptureSessionId mContentCaptureSessionId; - /** @hide */ protected MainContentCaptureSession(@NonNull Context context, @NonNull Handler handler, @Nullable IContentCaptureManager systemServerInterface, @@ -157,7 +156,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { if (!isContentCaptureEnabled()) return; if (VERBOSE) { - Log.v(mTag, "start(): token=" + applicationToken + ", comp=" + Log.v(TAG, "start(): token=" + applicationToken + ", comp=" + ComponentName.flattenToShortString(activityComponent)); } @@ -179,7 +178,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { private void handleStartSession(@NonNull IBinder token, @NonNull ComponentName componentName) { if (mState != STATE_UNKNOWN) { // TODO(b/111276913): revisit this scenario - Log.w(mTag, "ignoring handleStartSession(" + token + ") while on state " + Log.w(TAG, "ignoring handleStartSession(" + token + ") while on state " + getStateAsString(mState)); return; } @@ -188,7 +187,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { mComponentName = componentName; if (VERBOSE) { - Log.v(mTag, "handleStartSession(): token=" + token + ", act=" + Log.v(TAG, "handleStartSession(): token=" + token + ", act=" + getActivityDebugName() + ", id=" + mId); } final int flags = 0; // TODO(b/111276913): get proper flags @@ -202,7 +201,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { if (resultData != null) { binder = resultData.getBinder(EXTRA_BINDER); if (binder == null) { - Log.wtf(mTag, "No " + EXTRA_BINDER + " extra result"); + Log.wtf(TAG, "No " + EXTRA_BINDER + " extra result"); handleResetState(); return; } @@ -211,7 +210,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } }); } catch (RemoteException e) { - Log.w(mTag, "Error starting session for " + componentName.flattenToShortString() + ": " + Log.w(TAG, "Error starting session for " + componentName.flattenToShortString() + ": " + e); } } @@ -219,7 +218,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { /** * Callback from {@code system_server} after call to * {@link IContentCaptureManager#startSession(int, IBinder, ComponentName, String, - * ContentCaptureContext, int, IResultReceiver)}. + * int, IResultReceiver)}. * * @param resultCode session state * @param binder handle to {@code IContentCaptureDirectManager} @@ -229,13 +228,13 @@ public final class MainContentCaptureSession extends ContentCaptureSession { if (binder != null) { mDirectServiceInterface = IContentCaptureDirectManager.Stub.asInterface(binder); mDirectServiceVulture = () -> { - Log.w(mTag, "Destroying session " + mId + " because service died"); + Log.w(TAG, "Destroying session " + mId + " because service died"); destroy(); }; try { binder.linkToDeath(mDirectServiceVulture, 0); } catch (RemoteException e) { - Log.w(mTag, "Failed to link to death on " + binder + ": " + e); + Log.w(TAG, "Failed to link to death on " + binder + ": " + e); } } if (resultCode == STATE_DISABLED || resultCode == STATE_DISABLED_DUPLICATED_ID) { @@ -245,7 +244,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { mDisabled.set(false); } if (VERBOSE) { - Log.v(mTag, "handleSessionStarted() result: code=" + resultCode + ", id=" + mId + Log.v(TAG, "handleSessionStarted() result: code=" + resultCode + ", id=" + mId + ", state=" + getStateAsString(mState) + ", disabled=" + mDisabled.get() + ", binder=" + binder); } @@ -254,7 +253,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { private void handleSendEvent(@NonNull ContentCaptureEvent event, boolean forceFlush) { if (mEvents == null) { if (VERBOSE) { - Log.v(mTag, "Creating buffer for " + MAX_BUFFER_SIZE + " events"); + Log.v(TAG, "Creating buffer for " + MAX_BUFFER_SIZE + " events"); } mEvents = new ArrayList<>(MAX_BUFFER_SIZE); } @@ -266,7 +265,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { if (lastEvent.getType() == TYPE_VIEW_TEXT_CHANGED && lastEvent.getId().equals(event.getId())) { if (VERBOSE) { - Log.v(mTag, "Buffering VIEW_TEXT_CHANGED event, updated text = " + Log.v(TAG, "Buffering VIEW_TEXT_CHANGED event, updated text = " + event.getText()); } lastEvent.setText(event.getText()); @@ -293,7 +292,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { // not complete instead. Similarly, the manager service should return right away // when the user does not have a service set if (VERBOSE) { - Log.v(mTag, "Closing session for " + getActivityDebugName() + Log.v(TAG, "Closing session for " + getActivityDebugName() + " after " + numberEvents + " delayed events and state " + getStateAsString(mState)); } @@ -313,7 +312,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } mNextFlush = SystemClock.elapsedRealtime() + FLUSHING_FREQUENCY_MS; if (VERBOSE) { - Log.v(mTag, "Scheduled to flush in " + FLUSHING_FREQUENCY_MS + "ms: " + mNextFlush); + Log.v(TAG, "Scheduled to flush in " + FLUSHING_FREQUENCY_MS + "ms: " + mNextFlush); } mHandler.sendMessageDelayed( obtainMessage(MainContentCaptureSession::handleFlushIfNeeded, this) @@ -322,7 +321,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { private void handleFlushIfNeeded() { if (mEvents.isEmpty()) { - if (VERBOSE) Log.v(mTag, "Nothing to flush"); + if (VERBOSE) Log.v(TAG, "Nothing to flush"); return; } handleForceFlush(); @@ -332,7 +331,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { if (mEvents == null) return; if (mDirectServiceInterface == null) { - if (DEBUG) Log.d(mTag, "handleForceFlush(): hold your horses, client not ready yet!"); + if (DEBUG) Log.d(TAG, "handleForceFlush(): hold your horses, client not ready yet!"); if (!mHandler.hasMessages(MSG_FLUSH)) { handleScheduleFlush(/* checkExisting= */ false); } @@ -342,14 +341,14 @@ public final class MainContentCaptureSession extends ContentCaptureSession { final int numberEvents = mEvents.size(); try { if (DEBUG) { - Log.d(mTag, "Flushing " + numberEvents + " event(s) for " + getActivityDebugName()); + Log.d(TAG, "Flushing " + numberEvents + " event(s) for " + getActivityDebugName()); } mHandler.removeMessages(MSG_FLUSH); final ParceledListSlice<ContentCaptureEvent> events = handleClearEvents(); mDirectServiceInterface.sendEvents(events); } catch (RemoteException e) { - Log.w(mTag, "Error sending " + numberEvents + " for " + getActivityDebugName() + Log.w(TAG, "Error sending " + numberEvents + " for " + getActivityDebugName() + ": " + e); } } @@ -370,7 +369,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { private void handleDestroySession() { if (DEBUG) { - Log.d(mTag, "Destroying session (ctx=" + mContext + ", id=" + mId + ") with " + Log.d(TAG, "Destroying session (ctx=" + mContext + ", id=" + mId + ") with " + (mEvents == null ? 0 : mEvents.size()) + " event(s) for " + getActivityDebugName()); } @@ -378,7 +377,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { try { mSystemServerInterface.finishSession(mContext.getUserId(), mId); } catch (RemoteException e) { - Log.e(mTag, "Error destroying system-service session " + mId + " for " + Log.e(TAG, "Error destroying system-service session " + mId + " for " + getActivityDebugName() + ": " + e); } } @@ -395,8 +394,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } // TODO(b/121033016): must reset children (which currently is owned by superclass) - - mContentCaptureSessionId = null; mApplicationToken = null; mComponentName = null; mEvents = null; @@ -425,7 +422,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession { @Override boolean isContentCaptureEnabled() { - return mSystemServerInterface != null && !mDisabled.get(); + return super.isContentCaptureEnabled() && mSystemServerInterface != null + && !mDisabled.get(); } // TODO(b/121033016): refactor "notifyXXXX" methods below to a common "Buffer" object that is @@ -481,9 +479,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } pw.print(prefix); pw.print("mDisabled: "); pw.println(mDisabled.get()); pw.print(prefix); pw.print("isEnabled(): "); pw.println(isContentCaptureEnabled()); - if (mContentCaptureSessionId != null) { - pw.print(prefix); pw.print("public id: "); pw.println(mContentCaptureSessionId); - } pw.print(prefix); pw.print("state: "); pw.print(mState); pw.print(" ("); pw.print(getStateAsString(mState)); pw.println(")"); if (mApplicationToken != null) { diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java index 6ab7f66aedd3..ef69b6333cce 100644 --- a/core/java/android/webkit/WebViewDelegate.java +++ b/core/java/android/webkit/WebViewDelegate.java @@ -138,6 +138,20 @@ public final class WebViewDelegate { } /** + * Call webview draw functor. See API in draw_fn.h. + * @param canvas a hardware accelerated canvas (see {@link Canvas#isHardwareAccelerated()}). + * @param functor created by AwDrawFn_CreateFunctor in draw_fn.h. + */ + public void drawWebViewFunctor(@NonNull Canvas canvas, int functor) { + if (!(canvas instanceof RecordingCanvas)) { + // Canvas#isHardwareAccelerated() is only true for subclasses of RecordingCanvas. + throw new IllegalArgumentException(canvas.getClass().getName() + + " is not a RecordingCanvas canvas"); + } + ((RecordingCanvas) canvas).drawWebViewFunctor(functor); + } + + /** * Detaches the draw GL functor. * * @param nativeDrawGLFunctor the pointer to the native functor that implements diff --git a/core/java/android/webkit/WebViewZygote.java b/core/java/android/webkit/WebViewZygote.java index 49e11b8baf51..9f7aa6a2852a 100644 --- a/core/java/android/webkit/WebViewZygote.java +++ b/core/java/android/webkit/WebViewZygote.java @@ -159,6 +159,7 @@ public class WebViewZygote { 0, // runtimeFlags "webview_zygote", // seInfo sPackage.applicationInfo.primaryCpuAbi, // abi + TextUtils.join(",", Build.SUPPORTED_ABIS), null); // instructionSet // All the work below is usually done by LoadedApk, but the zygote can't talk to diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java index e83e79b2029e..925a5894db06 100644 --- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java +++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java @@ -357,15 +357,16 @@ public class AccessibilityShortcutController { } private boolean performTtsPrompt(AlertDialog alertDialog) { + final String serviceName = getShortcutFeatureDescription(false /* no summary */); final AccessibilityServiceInfo serviceInfo = getInfoForTargetService(); - if (serviceInfo == null) { + if (TextUtils.isEmpty(serviceName) || serviceInfo == null) { return false; } if ((serviceInfo.flags & AccessibilityServiceInfo .FLAG_REQUEST_SHORTCUT_WARNING_DIALOG_SPOKEN_FEEDBACK) == 0) { return false; } - final TtsPrompt tts = new TtsPrompt(); + final TtsPrompt tts = new TtsPrompt(serviceName); alertDialog.setOnDismissListener(dialog -> tts.dismiss()); return true; } @@ -378,8 +379,9 @@ public class AccessibilityShortcutController { private boolean mDismiss; private TextToSpeech mTts; - TtsPrompt() { - mText = mContext.getString(R.string.accessibility_shortcut_spoken_feedback); + TtsPrompt(String serviceName) { + mText = mContext.getString(R.string.accessibility_shortcut_spoken_feedback, + serviceName); mTts = mFrameworkObjectProvider.getTextToSpeech(mContext, this); } diff --git a/core/java/com/android/internal/app/ResolverComparator.java b/core/java/com/android/internal/app/ResolverComparator.java index 96d3baf7cf0b..f61a03bccb78 100644 --- a/core/java/com/android/internal/app/ResolverComparator.java +++ b/core/java/com/android/internal/app/ResolverComparator.java @@ -22,44 +22,36 @@ import android.app.usage.UsageStatsManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; +import android.content.ServiceConnection; import android.content.pm.ApplicationInfo; -import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; -import android.content.SharedPreferences; -import android.content.ServiceConnection; import android.metrics.LogMaker; -import android.os.Environment; import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Message; import android.os.RemoteException; -import android.os.storage.StorageManager; import android.os.UserHandle; -import android.service.resolver.IResolverRankerService; import android.service.resolver.IResolverRankerResult; +import android.service.resolver.IResolverRankerService; import android.service.resolver.ResolverRankerService; import android.service.resolver.ResolverTarget; -import android.text.TextUtils; -import android.util.ArrayMap; import android.util.Log; + import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import java.io.File; -import java.lang.InterruptedException; import java.text.Collator; import java.util.ArrayList; import java.util.Comparator; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; /** * Ranks and compares packages based on usage stats. @@ -90,6 +82,8 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { private final Collator mCollator; private final boolean mHttp; + // can be null if mHttp == false or current user has no default browser package + private final String mDefaultBrowserPackageName; private final PackageManager mPm; private final UsageStatsManager mUsm; private final Map<String, UsageStats> mStats; @@ -184,6 +178,10 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { getContentAnnotations(intent); mAction = intent.getAction(); mRankerServiceName = new ComponentName(mContext, this.getClass()); + + mDefaultBrowserPackageName = mHttp + ? mPm.getDefaultBrowserPackageNameAsUser(UserHandle.myUserId()) + : null; } // get annotations of content from intent. @@ -312,7 +310,14 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { if (mHttp) { // Special case: we want filters that match URI paths/schemes to be // ordered before others. This is for the case when opening URIs, - // to make native apps go above browsers. + // to make native apps go above browsers - except for 1 even more special case + // which is the default browser, as we want that to go above them all. + if (isDefaultBrowser(lhs)) { + return -1; + } + if (isDefaultBrowser(rhs)) { + return 1; + } final boolean lhsSpecific = ResolverActivity.isSpecificUriMatch(lhs.match); final boolean rhsSpecific = ResolverActivity.isSpecificUriMatch(rhs.match); if (lhsSpecific != rhsSpecific) { @@ -419,6 +424,20 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { } } + private boolean isDefaultBrowser(ResolveInfo ri) { + // It makes sense to prefer the default browser + // only if the targeted user is the current user + if (ri.targetUserId != UserHandle.USER_CURRENT) { + return false; + } + + if (ri.activityInfo.packageName != null + && ri.activityInfo.packageName.equals(mDefaultBrowserPackageName)) { + return true; + } + return false; + } + // records metrics for evaluation. private void logMetrics(int selectedPos) { if (mRankerServiceName != null) { diff --git a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java index 78d366cd2436..2995a8f43268 100644 --- a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java +++ b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java @@ -16,14 +16,14 @@ package com.android.internal.hardware; -import com.android.internal.R; - import android.content.Context; import android.os.Build; import android.os.SystemProperties; import android.provider.Settings; import android.text.TextUtils; +import com.android.internal.R; + public class AmbientDisplayConfiguration { private final Context mContext; @@ -37,7 +37,8 @@ public class AmbientDisplayConfiguration { public boolean enabled(int user) { return pulseOnNotificationEnabled(user) || pulseOnLongPressEnabled(user) - || alwaysOnEnabled(user); + || alwaysOnEnabled(user) + || wakeLockScreenGestureEnabled(user); } public boolean pulseOnNotificationEnabled(int user) { diff --git a/core/java/com/android/internal/os/AppZygoteInit.java b/core/java/com/android/internal/os/AppZygoteInit.java new file mode 100644 index 000000000000..afe6dade62ac --- /dev/null +++ b/core/java/com/android/internal/os/AppZygoteInit.java @@ -0,0 +1,105 @@ +/* + * 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.internal.os; + +import android.app.LoadedApk; +import android.content.pm.ApplicationInfo; +import android.net.LocalSocket; +import android.util.Log; + +import java.io.DataOutputStream; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +/** + * Startup class for an Application zygote process. + * + * See {@link ZygoteInit} for generic zygote startup documentation. + * + * @hide + */ +class AppZygoteInit { + public static final String TAG = "AppZygoteInit"; + + private static ZygoteServer sServer; + + private static class AppZygoteServer extends ZygoteServer { + @Override + protected ZygoteConnection createNewConnection(LocalSocket socket, String abiList) + throws IOException { + return new AppZygoteConnection(socket, abiList); + } + } + + private static class AppZygoteConnection extends ZygoteConnection { + AppZygoteConnection(LocalSocket socket, String abiList) throws IOException { + super(socket, abiList); + } + + @Override + protected void preload() { + // Nothing to preload by default. + } + + @Override + protected boolean isPreloadComplete() { + // App zygotes don't preload any classes or resources or defaults, all of their + // preloading is package specific. + return true; + } + + @Override + protected boolean canPreloadApp() { + return true; + } + + @Override + protected void handlePreloadApp(ApplicationInfo appInfo) { + Log.i(TAG, "Beginning application preload for " + appInfo.packageName); + LoadedApk loadedApk = new LoadedApk(null, appInfo, null, null, false, true, false); + ClassLoader loader = loadedApk.getClassLoader(); + Class<?> cl; + Method m; + try { + cl = Class.forName(appInfo.packageName + ".ZygotePreload", true, loader); + m = cl.getMethod("doPreload"); + m.setAccessible(true); + m.invoke(null); + } catch (ClassNotFoundException e) { + // Don't treat this as an error since an app may not want to do any preloads + Log.w(TAG, "No ZygotePreload class found for " + appInfo.packageName); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + Log.e(TAG, "AppZygote application preload failed for " + + appInfo.packageName, e); + } + try { + DataOutputStream socketOut = getSocketOutputStream(); + socketOut.writeInt(loader != null ? 1 : 0); + } catch (IOException e) { + throw new IllegalStateException("Error writing to command socket", e); + } + + Log.i(TAG, "Application preload done"); + } + } + + public static void main(String[] argv) { + AppZygoteServer server = new AppZygoteServer(); + ChildZygoteInit.runZygoteServer(server, argv); + } +} diff --git a/core/java/com/android/internal/os/ChildZygoteInit.java b/core/java/com/android/internal/os/ChildZygoteInit.java new file mode 100644 index 000000000000..f90cd0224596 --- /dev/null +++ b/core/java/com/android/internal/os/ChildZygoteInit.java @@ -0,0 +1,99 @@ +/* + * 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.internal.os; + +import android.system.ErrnoException; +import android.system.Os; +import android.system.OsConstants; +import android.util.Log; + +/** + * ChildZygoteInit is shared by both the Application and WebView zygote to initialize + * and run a (child) Zygote server. + * + * @hide + */ +public class ChildZygoteInit { + private static final String TAG = "ChildZygoteInit"; + + static String parseSocketNameFromArgs(String[] argv) { + for (String arg : argv) { + if (arg.startsWith(Zygote.CHILD_ZYGOTE_SOCKET_NAME_ARG)) { + return arg.substring(Zygote.CHILD_ZYGOTE_SOCKET_NAME_ARG.length()); + } + } + + return null; + } + + static String parseAbiListFromArgs(String[] argv) { + for (String arg : argv) { + if (arg.startsWith(Zygote.CHILD_ZYGOTE_ABI_LIST_ARG)) { + return arg.substring(Zygote.CHILD_ZYGOTE_ABI_LIST_ARG.length()); + } + } + + return null; + } + + /** + * Starts a ZygoteServer and listens for requests + * + * @param server An instance of a ZygoteServer to listen on + * @param args Passed in arguments for this ZygoteServer + */ + static void runZygoteServer(ZygoteServer server, String[] args) { + String socketName = parseSocketNameFromArgs(args); + if (socketName == null) { + throw new NullPointerException("No socketName specified"); + } + + String abiList = parseAbiListFromArgs(args); + if (abiList == null) { + throw new NullPointerException("No abiList specified"); + } + + try { + Os.prctl(OsConstants.PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); + } catch (ErrnoException ex) { + throw new RuntimeException("Failed to set PR_SET_NO_NEW_PRIVS", ex); + } + + final Runnable caller; + try { + server.registerServerSocketAtAbstractName(socketName); + + // Add the abstract socket to the FD whitelist so that the native zygote code + // can properly detach it after forking. + Zygote.nativeAllowFileAcrossFork("ABSTRACT/" + socketName); + + // The select loop returns early in the child process after a fork and + // loops forever in the zygote. + caller = server.runSelectLoop(abiList); + } catch (RuntimeException e) { + Log.e(TAG, "Fatal exception:", e); + throw e; + } finally { + server.closeServerSocket(); + } + + // We're in the child process and have exited the select loop. Proceed to execute the + // command. + if (caller != null) { + caller.run(); + } + } +} diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java index dc660a452c3b..a319d83b077d 100644 --- a/core/java/com/android/internal/os/RoSystemProperties.java +++ b/core/java/com/android/internal/os/RoSystemProperties.java @@ -30,6 +30,14 @@ public class RoSystemProperties { public static final String CONTROL_PRIVAPP_PERMISSIONS = SystemProperties.get("ro.control_privapp_permissions"); + /** + * Property to indicate if a CEC audio device should forward volume keys when system audio + * mode is off. + */ + public static final boolean CEC_AUDIO_DEVICE_FORWARD_VOLUME_KEYS_SYSTEM_AUDIO_MODE_OFF = + SystemProperties.getBoolean( + "ro.hdmi.cec_audio_device_forward_volume_keys_system_audio_mode_off", false); + // ------ ro.config.* -------- // public static final boolean CONFIG_AVOID_GFX_ACCEL = SystemProperties.getBoolean("ro.config.avoid_gfx_accel", false); diff --git a/core/java/com/android/internal/os/WebViewZygoteInit.java b/core/java/com/android/internal/os/WebViewZygoteInit.java index 9f2434e97d7a..0b329d70f7af 100644 --- a/core/java/com/android/internal/os/WebViewZygoteInit.java +++ b/core/java/com/android/internal/os/WebViewZygoteInit.java @@ -18,11 +18,7 @@ package com.android.internal.os; import android.app.ApplicationLoaders; import android.net.LocalSocket; -import android.net.LocalServerSocket; import android.os.Build; -import android.system.ErrnoException; -import android.system.Os; -import android.system.OsConstants; import android.text.TextUtils; import android.util.Log; import android.webkit.WebViewFactory; @@ -44,8 +40,6 @@ import java.lang.reflect.Method; class WebViewZygoteInit { public static final String TAG = "WebViewZygoteInit"; - private static ZygoteServer sServer; - private static class WebViewZygoteServer extends ZygoteServer { @Override protected ZygoteConnection createNewConnection(LocalSocket socket, String abiList) @@ -127,48 +121,7 @@ class WebViewZygoteInit { public static void main(String argv[]) { Log.i(TAG, "Starting WebViewZygoteInit"); - - String socketName = null; - for (String arg : argv) { - Log.i(TAG, arg); - if (arg.startsWith(Zygote.CHILD_ZYGOTE_SOCKET_NAME_ARG)) { - socketName = arg.substring(Zygote.CHILD_ZYGOTE_SOCKET_NAME_ARG.length()); - } - } - if (socketName == null) { - throw new RuntimeException("No " + Zygote.CHILD_ZYGOTE_SOCKET_NAME_ARG + " specified"); - } - - try { - Os.prctl(OsConstants.PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); - } catch (ErrnoException ex) { - throw new RuntimeException("Failed to set PR_SET_NO_NEW_PRIVS", ex); - } - - sServer = new WebViewZygoteServer(); - - final Runnable caller; - try { - sServer.registerServerSocketAtAbstractName(socketName); - - // Add the abstract socket to the FD whitelist so that the native zygote code - // can properly detach it after forking. - Zygote.nativeAllowFileAcrossFork("ABSTRACT/" + socketName); - - // The select loop returns early in the child process after a fork and - // loops forever in the zygote. - caller = sServer.runSelectLoop(TextUtils.join(",", Build.SUPPORTED_ABIS)); - } catch (RuntimeException e) { - Log.e(TAG, "Fatal exception:", e); - throw e; - } finally { - sServer.closeServerSocket(); - } - - // We're in the child process and have exited the select loop. Proceed to execute the - // command. - if (caller != null) { - caller.run(); - } + WebViewZygoteServer server = new WebViewZygoteServer(); + ChildZygoteInit.runZygoteServer(server, argv); } } diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 65b9fad97d89..d720c689f5de 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -98,6 +98,12 @@ public final class Zygote { */ public static final String CHILD_ZYGOTE_SOCKET_NAME_ARG = "--zygote-socket="; + /** + * An extraArg passed when a zygote process is forking a child-zygote, specifying the + * requested ABI for the child Zygote. + */ + public static final String CHILD_ZYGOTE_ABI_LIST_ARG = "--abi-list="; + private Zygote() {} /** Called for some security initialization before any fork. */ diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index f182c4d447df..5990d72d89b4 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -27,9 +27,11 @@ import static com.android.internal.os.ZygoteConnectionConstants.CONNECTION_TIMEO import static com.android.internal.os.ZygoteConnectionConstants.MAX_ZYGOTE_ARGC; import static com.android.internal.os.ZygoteConnectionConstants.WRAPPED_PID_TIMEOUT_MILLIS; +import android.content.pm.ApplicationInfo; import android.net.Credentials; import android.net.LocalSocket; import android.os.FactoryTest; +import android.os.Parcel; import android.os.Process; import android.os.SystemProperties; import android.os.Trace; @@ -52,6 +54,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; +import java.util.Base64; /** * A connection that can make spawn requests. @@ -168,6 +171,21 @@ class ZygoteConnection { return null; } + if (canPreloadApp() && parsedArgs.mPreloadApp != null) { + byte[] rawParcelData = Base64.getDecoder().decode(parsedArgs.mPreloadApp); + Parcel appInfoParcel = Parcel.obtain(); + appInfoParcel.unmarshall(rawParcelData, 0, rawParcelData.length); + appInfoParcel.setDataPosition(0); + ApplicationInfo appInfo = ApplicationInfo.CREATOR.createFromParcel(appInfoParcel); + appInfoParcel.recycle(); + if (appInfo != null) { + handlePreloadApp(appInfo); + } else { + throw new IllegalArgumentException("Failed to deserialize --preload-app"); + } + return null; + } + if (parsedArgs.apiBlacklistExemptions != null) { handleApiBlacklistExemptions(parsedArgs.apiBlacklistExemptions); return null; @@ -341,7 +359,15 @@ class ZygoteConnection { protected void handlePreloadPackage(String packagePath, String libsPath, String libFileName, String cacheKey) { - throw new RuntimeException("Zyogte does not support package preloading"); + throw new RuntimeException("Zygote does not support package preloading"); + } + + protected boolean canPreloadApp() { + return false; + } + + protected void handlePreloadApp(ApplicationInfo aInfo) { + throw new RuntimeException("Zygote does not support app preloading"); } /** @@ -467,6 +493,12 @@ class ZygoteConnection { String preloadPackage; /** + * A Base64 string representing a serialize ApplicationInfo Parcel, + when using --preload-app. + */ + String mPreloadApp; + + /** * The native library path of the package to preload, when using --preload-package. */ String preloadPackageLibs; @@ -666,6 +698,8 @@ class ZygoteConnection { instructionSet = arg.substring(arg.indexOf('=') + 1); } else if (arg.startsWith("--app-data-dir=")) { appDataDir = arg.substring(arg.indexOf('=') + 1); + } else if (arg.equals("--preload-app")) { + mPreloadApp = args[++curArg]; } else if (arg.equals("--preload-package")) { preloadPackage = args[++curArg]; preloadPackageLibs = args[++curArg]; @@ -714,6 +748,11 @@ class ZygoteConnection { throw new IllegalArgumentException( "Unexpected arguments after --preload-package."); } + } else if (mPreloadApp != null) { + if (args.length - curArg > 0) { + throw new IllegalArgumentException( + "Unexpected arguments after --preload-app."); + } } else if (expectRuntimeArgs) { if (!seenRuntimeArgs) { throw new IllegalArgumentException("Unexpected argument : " + args[curArg]); diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 030116b08f40..6a4b633df6a2 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -348,6 +348,15 @@ static void nativeSetInputWindowInfo(JNIEnv* env, jclass clazz, jlong transactio transaction->setInputWindowInfo(ctrl, *handle->getInfo()); } +static void nativeTransferTouchFocus(JNIEnv* env, jclass clazz, jlong transactionObj, + jobject fromTokenObj, jobject toTokenObj) { + auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj); + + sp<IBinder> fromToken(ibinderForJavaObject(env, fromTokenObj)); + sp<IBinder> toToken(ibinderForJavaObject(env, toTokenObj)); + transaction->transferTouchFocus(fromToken, toToken); +} + static void nativeSetColor(JNIEnv* env, jclass clazz, jlong transactionObj, jlong nativeObject, jfloatArray fColor) { auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj); @@ -1047,7 +1056,9 @@ static const JNINativeMethod sSurfaceControlMethods[] = { {"nativeCaptureLayers", "(Landroid/os/IBinder;Landroid/graphics/Rect;F)Landroid/graphics/GraphicBuffer;", (void*)nativeCaptureLayers }, {"nativeSetInputWindowInfo", "(JJLandroid/view/InputWindowHandle;)V", - (void*)nativeSetInputWindowInfo }, + (void*)nativeSetInputWindowInfo }, + {"nativeTransferTouchFocus", "(JLandroid/os/IBinder;Landroid/os/IBinder;)V", + (void*)nativeTransferTouchFocus }, {"nativeGetDisplayedContentSamplingAttributes", "(Landroid/os/IBinder;)Landroid/hardware/display/DisplayedContentSamplingAttributes;", (void*)nativeGetDisplayedContentSamplingAttributes }, diff --git a/core/proto/android/os/enums.proto b/core/proto/android/os/enums.proto index db4a4c4d836b..c35706501c3d 100644 --- a/core/proto/android/os/enums.proto +++ b/core/proto/android/os/enums.proto @@ -57,6 +57,7 @@ enum BatteryStatusEnum { } // These constants are defined in hardware/interfaces/thermal/1.0/types.hal +// and in hardware/interfaces/thermal/2.0/types.hal // They are primarily used by android/os/HardwarePropertiesManager.java. // Any change to the types in the thermal hal should be made here as well. enum TemperatureTypeEnum { @@ -65,6 +66,16 @@ enum TemperatureTypeEnum { TEMPERATURE_TYPE_GPU = 1; TEMPERATURE_TYPE_BATTERY = 2; TEMPERATURE_TYPE_SKIN = 3; + TEMPERATURE_TYPE_USB_PORT = 4; + TEMPERATURE_TYPE_POWER_AMPLIFIER = 5; + + // Battery Charge Limit - virtual thermal sensors. + TEMPERATURE_TYPE_BCL_VOLTAGE = 6; + TEMPERATURE_TYPE_BCL_CURRENT = 7; + TEMPERATURE_TYPE_BCL_PERCENTAGE = 8; + + // Neural Processing Unit. + TEMPERATURE_TYPE_NPU = 9; } // Wakelock types, primarily used by android/os/PowerManager.java. diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 11bd43b11977..a914369a036c 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -436,9 +436,11 @@ message GlobalSettingsProto { // Ordered GPU debug layer list for GLES // i.e. <layer1>:<layer2>:...:<layerN> optional SettingProto debug_layers_gles = 7; - // App opt in to load updated graphics driver instead of - // native graphcis driver through developer options. - optional SettingProto updated_gfx_driver_dev_opt_in_app = 8; + // Apps opt in to load graphics driver from Game Update Package + // instead of native graphcis driver through developer options. + optional SettingProto gup_dev_opt_in_apps = 8; + // Apps on the black list that are forbidden to useGame Update Package. + optional SettingProto gup_black_list = 9; } optional Gpu gpu = 59; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b16c16d0a703..0778304d26aa 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3379,6 +3379,11 @@ <permission android:name="android.permission.REVOKE_RUNTIME_PERMISSIONS" android:protectionLevel="signature|installer|verifier" /> + <!-- @SystemApi Allows the system to read runtime permission state. + @hide --> + <permission android:name="android.permission.GET_RUNTIME_PERMISSIONS" + android:protectionLevel="signature" /> + <!-- @hide Allows an application to observe permission changes. --> <permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" android:protectionLevel="signature|privileged" /> @@ -3854,6 +3859,10 @@ <permission android:name="android.permission.PACKAGE_ROLLBACK_AGENT" android:protectionLevel="signature" /> + <!-- @SystemApi @hide Allows managing apk level rollbacks. --> + <permission android:name="android.permission.MANAGE_ROLLBACKS" + android:protectionLevel="signature|installer" /> + <!-- @SystemApi @hide Allows an application to mark other applications as harmful --> <permission android:name="android.permission.SET_HARMFUL_APP_WARNINGS" android:protectionLevel="signature|verifier" /> diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml index 7dee2af3abbd..ded2b3569952 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -31,7 +31,7 @@ android:layout_alwaysShow="true" android:elevation="8dp" android:paddingStart="16dp" - android:background="@color/white" > + android:background="?attr/colorBackgroundFloating" > <TextView android:id="@+id/profile_button" android:layout_width="wrap_content" android:layout_height="48dp" @@ -73,7 +73,7 @@ android:id="@+id/resolver_list" android:clipToPadding="false" android:scrollbarStyle="outsideOverlay" - android:background="@color/white" + android:background="?attr/colorBackgroundFloating" android:elevation="8dp" android:listSelector="@color/transparent" android:divider="@null" @@ -84,7 +84,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alwaysShow="true" - android:background="@color/white" + android:background="?attr/colorBackgroundFloating" android:text="@string/noApplications" android:padding="32dp" android:gravity="center" diff --git a/core/res/res/values-land/dimens_permission_controller.xml b/core/res/res/values-land/dimens_permission_controller.xml deleted file mode 100644 index 2146241fd830..000000000000 --- a/core/res/res/values-land/dimens_permission_controller.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2018 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!-- Landscape dimensions for the permission grant dialog. --> -<resources> - <!-- Assuming the dimension of a sailfish, this yields 95% width in splitscreen and 65% in - landscape --> - <dimen name="permissionGrantDialogWeight">8.6</dimen> - <dimen name="permissionGrantDialogWidth">334dp</dimen> -</resources> diff --git a/core/res/res/values-night/themes_permission_controller.xml b/core/res/res/values-night/themes_permission_controller.xml deleted file mode 100644 index a071927f46b2..000000000000 --- a/core/res/res/values-night/themes_permission_controller.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2018 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!-- themes for the permission grant dialog. --> -<resources> - <style name="Theme.DeviceDefault.PermissionGrantApp" - parent="@style/Theme.DeviceDefault.Panel"> - <item name="windowIsFloating">false</item> - <item name="windowTranslucentStatus">true</item> - <item name="backgroundDimEnabled">true</item> - <item name="windowAnimationStyle">@style/Animation.Material.Dialog</item> - </style> - - <style name="Theme.DeviceDefault.PermissionGrant" - parent="@style/Theme.DeviceDefault.Dialog"> - <item name="titleTextStyle">@style/PermissionGrantTitleMessage</item> - </style> -</resources> diff --git a/core/res/res/values-port/dimens_permission_controller.xml b/core/res/res/values-port/dimens_permission_controller.xml deleted file mode 100644 index af28713e5ba2..000000000000 --- a/core/res/res/values-port/dimens_permission_controller.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2018 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!-- portrait dimensions for the permission grant dialog. --> -<resources> - <!-- This yields 95% width --> - <dimen name="permissionGrantDialogWeight">380</dimen> - <dimen name="permissionGrantDialogWidth">0dp</dimen> -</resources> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 91faa5517860..183c2e8cf486 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3755,6 +3755,8 @@ <!-- Component name of an activity that allows the user to modify the settings for this service. --> <attr name="settingsActivity"/> + <!-- Secure Element which the AIDs should be routed to --> + <attr name="secureElementName"/> </declare-styleable> <!-- Specify one or more <code>aid-group</code> elements inside a diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 2b95dd088434..a7bc57afa749 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4436,7 +4436,8 @@ <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g> off</string> <!-- Text spoken when accessibility shortcut warning dialog is shown. [CHAR LIMIT=none] --> - <string name="accessibility_shortcut_spoken_feedback">Use Accessibility Shortcut again to start the current accessibility feature</string> + <string name="accessibility_shortcut_spoken_feedback">Press and hold both volume keys for three seconds to use + <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g></string> <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button in the navigation bar. --> <string name="accessibility_button_prompt_text">Choose a feature to use when you tap the Accessibility button:</string> diff --git a/core/res/res/values/styles_permission_controller.xml b/core/res/res/values/styles_permission_controller.xml deleted file mode 100644 index 5a9d3e6c2889..000000000000 --- a/core/res/res/values/styles_permission_controller.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2018 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources> - <!-- styles for the permission grant dialog. --> - <style name="PermissionGrantDialog"> - <item name="background">?attr/windowBackground</item> - <item name="elevation">?attr/windowElevation</item> - <item name="layout_weight">@dimen/permissionGrantDialogWeight</item> - <item name="layout_width">@dimen/permissionGrantDialogWidth</item> - </style> - - <style name="PermissionGrantTitleIcon"> - <item name="layout_width">24dp</item> - <item name="layout_height">24dp</item> - <item name="layout_marginBottom">12dp</item> - <item name="tint">?attr/colorAccent</item> - <item name="scaleType">fitCenter</item> - </style> - - <style name="PermissionGrantTitleMessage" - parent="@style/TextAppearance.DeviceDefault"> - <item name="gravity">center</item> - <item name="textSize">20sp</item> - <item name="textColor">?attr/textColorPrimary</item> - </style> - - <style name="PermissionGrantIndex" - parent="@style/TextAppearance.DeviceDefault"> - <item name="paddingEnd">12dp</item> - <item name="singleLine">true</item> - <item name="textColor">?attr/textColorSecondary</item> - </style> - - <style name="PermissionGrantDescription"> - <item name="layout_marginStart">24dp</item> - <item name="layout_marginEnd">24dp</item> - </style> - - <style name="PermissionGrantContent"> - <item name="layout_marginStart">24dp</item> - <item name="layout_marginEnd">24dp</item> - </style> - - <style name="PermissionGrantDetailMessage" - parent="@style/TextAppearance.DeviceDefault"> - <item name="layout_marginTop">18dp</item> - <item name="textColor">?attr/textColorPrimary</item> - <item name="textSize">16sp</item> - </style> - - <!-- styles for the permission review screen. --> - <style name="PermissionReviewDescription"> - <item name="layout_marginTop">20dp</item> - <item name="layout_marginStart">24dp</item> - <item name="layout_marginBottom">16dp</item> - <item name="layout_marginEnd">24dp</item> - </style> - - <style name="PermissionReviewTitleIcon"> - <item name="layout_marginTop">4dp</item> - <item name="layout_width">36dp</item> - <item name="layout_height">36dp</item> - <item name="scaleType">fitCenter</item> - </style> - - <style name="PermissionReviewTitleMessage" - parent="@style/TextAppearance.DeviceDefault"> - <item name="paddingStart">22dp</item> - <item name="textSize">20sp</item> - <item name="textColor">?attr/textColorPrimary</item> - </style> - - <style name="PermissionReviewSettings"> - <item name="layout_marginStart">8dp</item> - <item name="layout_marginEnd">8dp</item> - </style> - - <style name="PermissionReviewButtonBar"> - <item name="layout_marginStart">24dp</item> - <item name="layout_marginEnd">16dp</item> - <item name="layout_marginBottom">4dp</item> - </style> -</resources> diff --git a/core/res/res/values/themes_permission_controller.xml b/core/res/res/values/themes_permission_controller.xml deleted file mode 100644 index 205c4eb2d9a2..000000000000 --- a/core/res/res/values/themes_permission_controller.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2018 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources> - <!-- themes for the permission grant dialog. --> - <style name="Theme.DeviceDefault.PermissionGrantApp" - parent="@style/Theme.DeviceDefault.Light.Panel"> - <item name="windowIsFloating">false</item> - <item name="windowTranslucentStatus">true</item> - <item name="backgroundDimEnabled">true</item> - <item name="windowAnimationStyle">@style/Animation.Material.Dialog</item> - </style> - - <style name="Theme.DeviceDefault.PermissionGrant" - parent="@style/Theme.DeviceDefault.Light.Dialog"> - <item name="titleTextStyle">@style/PermissionGrantTitleMessage</item> - </style> - - <!-- themes for the permission review dialog. --> - <style name="Theme.DeviceDefault.PermissionReviewApp" - parent="@style/Theme.DeviceDefault.Settings"> - <item name="windowActionBar">false</item> - <item name="windowNoTitle">true</item> - <item name="titleTextStyle">@style/PermissionReviewTitleMessage</item> - </style> -</resources> diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index f8bd4e33ec75..ac57d20a438a 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -475,7 +475,8 @@ public class SettingsBackupTest { Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS, Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES, - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, + Settings.Global.GUP_DEV_OPT_IN_APPS, + Settings.Global.GUP_BLACK_LIST, Settings.Global.GPU_DEBUG_LAYER_APP, Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT, diff --git a/core/tests/featureflagtests/Android.mk b/core/tests/featureflagtests/Android.mk index 5e518b60a9ee..ce7cb181b53a 100644 --- a/core/tests/featureflagtests/Android.mk +++ b/core/tests/featureflagtests/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) LOCAL_DX_FLAGS := --core-library -LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/core/tests/featureflagtests/AndroidManifest.xml b/core/tests/featureflagtests/AndroidManifest.xml index b8ffacbe5aa8..326374e47702 100644 --- a/core/tests/featureflagtests/AndroidManifest.xml +++ b/core/tests/featureflagtests/AndroidManifest.xml @@ -26,7 +26,7 @@ </application> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.frameworks.coretests.featureflagtests" android:label="Frameworks FeatureFlagUtils Tests" /> diff --git a/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java b/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java index 0b1b333a1ddc..316042874201 100644 --- a/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java +++ b/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java @@ -24,10 +24,11 @@ import static junit.framework.Assert.assertTrue; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 6a4079256268..04bf804f091a 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -312,9 +312,8 @@ <font weight="700" style="normal">NotoSansLaoUI-Bold.ttf</font> </family> <family lang="und-Mymr" variant="elegant"> - <font weight="400" style="normal">NotoSansMyanmar-Regular.otf</font> - <font weight="500" style="normal">NotoSansMyanmar-Medium.otf</font> - <font weight="700" style="normal">NotoSansMyanmar-Bold.otf</font> + <font weight="400" style="normal">NotoSansMyanmar-Regular-ZawDecode.ttf</font> + <font weight="700" style="normal">NotoSansMyanmar-Bold-ZawDecode.ttf</font> <font weight="400" style="normal" fallbackFor="serif">NotoSerifMyanmar-Regular.otf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifMyanmar-Bold.otf</font> </family> diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk index bb8add1187e7..c6c7d3bca724 100644 --- a/data/sounds/AllAudio.mk +++ b/data/sounds/AllAudio.mk @@ -15,227 +15,227 @@ LOCAL_PATH := frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/Alarm_Beep_01.ogg:system/media/audio/alarms/Alarm_Beep_01.ogg \ - $(LOCAL_PATH)/Alarm_Beep_02.ogg:system/media/audio/alarms/Alarm_Beep_02.ogg \ - $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ - $(LOCAL_PATH)/Alarm_Buzzer.ogg:system/media/audio/alarms/Alarm_Buzzer.ogg \ - $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ - $(LOCAL_PATH)/Alarm_Rooster_02.ogg:system/media/audio/alarms/Alarm_Rooster_02.ogg \ - $(LOCAL_PATH)/alarms/ogg/Argon.ogg:system/media/audio/alarms/Argon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Barium.ogg:system/media/audio/alarms/Barium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:system/media/audio/alarms/Carbon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:system/media/audio/alarms/Cesium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Fermium.ogg:system/media/audio/alarms/Fermium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Hassium.ogg:system/media/audio/alarms/Hassium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Helium.ogg:system/media/audio/alarms/Helium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:system/media/audio/alarms/Krypton.ogg \ - $(LOCAL_PATH)/alarms/ogg/Neon.ogg:system/media/audio/alarms/Neon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Neptunium.ogg:system/media/audio/alarms/Neptunium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Nobelium.ogg:system/media/audio/alarms/Nobelium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:system/media/audio/alarms/Osmium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:system/media/audio/alarms/Oxygen.ogg \ - $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:system/media/audio/alarms/Platinum.ogg \ - $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:system/media/audio/alarms/Plutonium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Promethium.ogg:system/media/audio/alarms/Promethium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Scandium.ogg:system/media/audio/alarms/Scandium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ - $(LOCAL_PATH)/notifications/Aldebaran.ogg:system/media/audio/notifications/Aldebaran.ogg \ - $(LOCAL_PATH)/notifications/Altair.ogg:system/media/audio/notifications/Altair.ogg \ - $(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \ - $(LOCAL_PATH)/notifications/Antares.ogg:system/media/audio/notifications/Antares.ogg \ - $(LOCAL_PATH)/notifications/ogg/Antimony.ogg:system/media/audio/notifications/Antimony.ogg \ - $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Argon.ogg:system/media/audio/notifications/Argon.ogg \ - $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \ - $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:system/media/audio/notifications/Bellatrix.ogg \ - $(LOCAL_PATH)/notifications/ogg/Beryllium.ogg:system/media/audio/notifications/Beryllium.ogg \ - $(LOCAL_PATH)/notifications/Betelgeuse.ogg:system/media/audio/notifications/Betelgeuse.ogg \ - $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg \ - $(LOCAL_PATH)/notifications/Canopus.ogg:system/media/audio/notifications/Canopus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/Castor.ogg:system/media/audio/notifications/Castor.ogg \ - $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Cobalt.ogg:system/media/audio/notifications/Cobalt.ogg \ - $(LOCAL_PATH)/notifications/Cricket.ogg:system/media/audio/notifications/Cricket.ogg \ - $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:system/media/audio/notifications/DearDeer.ogg \ - $(LOCAL_PATH)/notifications/Deneb.ogg:system/media/audio/notifications/Deneb.ogg \ - $(LOCAL_PATH)/notifications/Doink.ogg:system/media/audio/notifications/Doink.ogg \ - $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:system/media/audio/notifications/DontPanic.ogg \ - $(LOCAL_PATH)/notifications/Drip.ogg:system/media/audio/notifications/Drip.ogg \ - $(LOCAL_PATH)/notifications/Electra.ogg:system/media/audio/notifications/Electra.ogg \ - $(LOCAL_PATH)/F1_MissedCall.ogg:system/media/audio/notifications/F1_MissedCall.ogg \ - $(LOCAL_PATH)/F1_New_MMS.ogg:system/media/audio/notifications/F1_New_MMS.ogg \ - $(LOCAL_PATH)/F1_New_SMS.ogg:system/media/audio/notifications/F1_New_SMS.ogg \ - $(LOCAL_PATH)/notifications/ogg/Fluorine.ogg:system/media/audio/notifications/Fluorine.ogg \ - $(LOCAL_PATH)/notifications/Fomalhaut.ogg:system/media/audio/notifications/Fomalhaut.ogg \ - $(LOCAL_PATH)/notifications/ogg/Gallium.ogg:system/media/audio/notifications/Gallium.ogg \ - $(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.ogg \ - $(LOCAL_PATH)/notifications/ogg/Helium.ogg:system/media/audio/notifications/Helium.ogg \ - $(LOCAL_PATH)/newwavelabs/Highwire.ogg:system/media/audio/notifications/Highwire.ogg \ - $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:system/media/audio/notifications/Hojus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Iridium.ogg:system/media/audio/notifications/Iridium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Krypton.ogg:system/media/audio/notifications/Krypton.ogg \ - $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:system/media/audio/notifications/KzurbSonar.ogg \ - $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:system/media/audio/notifications/Lalande.ogg \ - $(LOCAL_PATH)/notifications/Merope.ogg:system/media/audio/notifications/Merope.ogg \ - $(LOCAL_PATH)/notifications/ogg/Mira.ogg:system/media/audio/notifications/Mira.ogg \ - $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:system/media/audio/notifications/OnTheHunt.ogg \ - $(LOCAL_PATH)/notifications/ogg/Palladium.ogg:system/media/audio/notifications/Palladium.ogg \ - $(LOCAL_PATH)/notifications/Plastic_Pipe.ogg:system/media/audio/notifications/Plastic_Pipe.ogg \ - $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:system/media/audio/notifications/Polaris.ogg \ - $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:system/media/audio/notifications/Proxima.ogg \ - $(LOCAL_PATH)/notifications/ogg/Radon.ogg:system/media/audio/notifications/Radon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Rubidium.ogg:system/media/audio/notifications/Rubidium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Selenium.ogg:system/media/audio/notifications/Selenium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:system/media/audio/notifications/Shaula.ogg \ - $(LOCAL_PATH)/notifications/Sirrah.ogg:system/media/audio/notifications/Sirrah.ogg \ - $(LOCAL_PATH)/notifications/SpaceSeed.ogg:system/media/audio/notifications/SpaceSeed.ogg \ - $(LOCAL_PATH)/notifications/ogg/Spica.ogg:system/media/audio/notifications/Spica.ogg \ - $(LOCAL_PATH)/notifications/ogg/Strontium.ogg:system/media/audio/notifications/Strontium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:system/media/audio/notifications/Syrma.ogg \ - $(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \ - $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:system/media/audio/notifications/Talitha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:system/media/audio/notifications/Tejat.ogg \ - $(LOCAL_PATH)/notifications/ogg/Thallium.ogg:system/media/audio/notifications/Thallium.ogg \ - $(LOCAL_PATH)/notifications/Tinkerbell.ogg:system/media/audio/notifications/Tinkerbell.ogg \ - $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:system/media/audio/notifications/Upsilon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Vega.ogg:system/media/audio/notifications/Vega.ogg \ - $(LOCAL_PATH)/newwavelabs/Voila.ogg:system/media/audio/notifications/Voila.ogg \ - $(LOCAL_PATH)/notifications/ogg/Xenon.ogg:system/media/audio/notifications/Xenon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Zirconium.ogg:system/media/audio/notifications/Zirconium.ogg \ - $(LOCAL_PATH)/notifications/arcturus.ogg:system/media/audio/notifications/arcturus.ogg \ - $(LOCAL_PATH)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \ - $(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \ - $(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \ - $(LOCAL_PATH)/notifications/regulus.ogg:system/media/audio/notifications/regulus.ogg \ - $(LOCAL_PATH)/notifications/sirius.ogg:system/media/audio/notifications/sirius.ogg \ - $(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg \ - $(LOCAL_PATH)/notifications/vega.ogg:system/media/audio/notifications/vega.ogg \ - $(LOCAL_PATH)/ringtones/ANDROMEDA.ogg:system/media/audio/ringtones/ANDROMEDA.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:system/media/audio/ringtones/Andromeda.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ - $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Atria.ogg:system/media/audio/ringtones/Atria.ogg \ - $(LOCAL_PATH)/ringtones/BOOTES.ogg:system/media/audio/ringtones/BOOTES.ogg \ - $(LOCAL_PATH)/newwavelabs/Backroad.ogg:system/media/audio/ringtones/Backroad.ogg \ - $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \ - $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:system/media/audio/ringtones/BentleyDubs.ogg \ - $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:system/media/audio/ringtones/Big_Easy.ogg \ - $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ - $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:system/media/audio/ringtones/Bollywood.ogg \ - $(LOCAL_PATH)/newwavelabs/BussaMove.ogg:system/media/audio/ringtones/BussaMove.ogg \ - $(LOCAL_PATH)/ringtones/CANISMAJOR.ogg:system/media/audio/ringtones/CANISMAJOR.ogg \ - $(LOCAL_PATH)/ringtones/CASSIOPEIA.ogg:system/media/audio/ringtones/CASSIOPEIA.ogg \ - $(LOCAL_PATH)/newwavelabs/Cairo.ogg:system/media/audio/ringtones/Cairo.ogg \ - $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:system/media/audio/ringtones/Calypso_Steel.ogg \ - $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:system/media/audio/ringtones/CanisMajor.ogg \ - $(LOCAL_PATH)/newwavelabs/CaribbeanIce.ogg:system/media/audio/ringtones/CaribbeanIce.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:system/media/audio/ringtones/Carina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \ - $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:system/media/audio/ringtones/Champagne_Edition.ogg \ - $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:system/media/audio/ringtones/Club_Cubano.ogg \ - $(LOCAL_PATH)/newwavelabs/CrayonRock.ogg:system/media/audio/ringtones/CrayonRock.ogg \ - $(LOCAL_PATH)/newwavelabs/CrazyDream.ogg:system/media/audio/ringtones/CrazyDream.ogg \ - $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:system/media/audio/ringtones/CurveBall.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \ - $(LOCAL_PATH)/newwavelabs/DancinFool.ogg:system/media/audio/ringtones/DancinFool.ogg \ - $(LOCAL_PATH)/newwavelabs/Ding.ogg:system/media/audio/ringtones/Ding.ogg \ - $(LOCAL_PATH)/newwavelabs/DonMessWivIt.ogg:system/media/audio/ringtones/DonMessWivIt.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:system/media/audio/ringtones/Draco.ogg \ - $(LOCAL_PATH)/newwavelabs/DreamTheme.ogg:system/media/audio/ringtones/DreamTheme.ogg \ - $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:system/media/audio/ringtones/Eastern_Sky.ogg \ - $(LOCAL_PATH)/newwavelabs/Enter_the_Nexus.ogg:system/media/audio/ringtones/Enter_the_Nexus.ogg \ - $(LOCAL_PATH)/ringtones/Eridani.ogg:system/media/audio/ringtones/Eridani.ogg \ - $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:system/media/audio/ringtones/EtherShake.ogg \ - $(LOCAL_PATH)/ringtones/FreeFlight.ogg:system/media/audio/ringtones/FreeFlight.ogg \ - $(LOCAL_PATH)/newwavelabs/FriendlyGhost.ogg:system/media/audio/ringtones/FriendlyGhost.ogg \ - $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:system/media/audio/ringtones/Funk_Yall.ogg \ - $(LOCAL_PATH)/newwavelabs/GameOverGuitar.ogg:system/media/audio/ringtones/GameOverGuitar.ogg \ - $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:system/media/audio/ringtones/Gimme_Mo_Town.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:system/media/audio/ringtones/Girtab.ogg \ - $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:system/media/audio/ringtones/Glacial_Groove.ogg \ - $(LOCAL_PATH)/newwavelabs/Growl.ogg:system/media/audio/ringtones/Growl.ogg \ - $(LOCAL_PATH)/newwavelabs/HalfwayHome.ogg:system/media/audio/ringtones/HalfwayHome.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:system/media/audio/ringtones/Hydra.ogg \ - $(LOCAL_PATH)/newwavelabs/InsertCoin.ogg:system/media/audio/ringtones/InsertCoin.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:system/media/audio/ringtones/Kuma.ogg \ - $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:system/media/audio/ringtones/LoopyLounge.ogg \ - $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:system/media/audio/ringtones/LoveFlute.ogg \ - $(LOCAL_PATH)/ringtones/Lyra.ogg:system/media/audio/ringtones/Lyra.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:system/media/audio/ringtones/Machina.ogg \ - $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:system/media/audio/ringtones/MidEvilJaunt.ogg \ - $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:system/media/audio/ringtones/MildlyAlarming.ogg \ - $(LOCAL_PATH)/newwavelabs/Nairobi.ogg:system/media/audio/ringtones/Nairobi.ogg \ - $(LOCAL_PATH)/newwavelabs/Nassau.ogg:system/media/audio/ringtones/Nassau.ogg \ - $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:system/media/audio/ringtones/NewPlayer.ogg \ - $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:system/media/audio/ringtones/No_Limits.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises1.ogg:system/media/audio/ringtones/Noises1.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises2.ogg:system/media/audio/ringtones/Noises2.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises3.ogg:system/media/audio/ringtones/Noises3.ogg \ - $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:system/media/audio/ringtones/OrganDub.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:system/media/audio/ringtones/Orion.ogg \ - $(LOCAL_PATH)/ringtones/PERSEUS.ogg:system/media/audio/ringtones/PERSEUS.ogg \ - $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:system/media/audio/ringtones/Paradise_Island.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:system/media/audio/ringtones/Perseus.ogg \ - $(LOCAL_PATH)/newwavelabs/Playa.ogg:system/media/audio/ringtones/Playa.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Rasalas.ogg:system/media/audio/ringtones/Rasalas.ogg \ - $(LOCAL_PATH)/newwavelabs/Revelation.ogg:system/media/audio/ringtones/Revelation.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \ - $(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \ - $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ - $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:system/media/audio/ringtones/Road_Trip.ogg \ - $(LOCAL_PATH)/newwavelabs/RomancingTheTone.ogg:system/media/audio/ringtones/RomancingTheTone.ogg \ - $(LOCAL_PATH)/newwavelabs/Safari.ogg:system/media/audio/ringtones/Safari.ogg \ - $(LOCAL_PATH)/newwavelabs/Savannah.ogg:system/media/audio/ringtones/Savannah.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ - $(LOCAL_PATH)/newwavelabs/Seville.ogg:system/media/audio/ringtones/Seville.ogg \ - $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:system/media/audio/ringtones/Shes_All_That.ogg \ - $(LOCAL_PATH)/newwavelabs/SilkyWay.ogg:system/media/audio/ringtones/SilkyWay.ogg \ - $(LOCAL_PATH)/newwavelabs/SitarVsSitar.ogg:system/media/audio/ringtones/SitarVsSitar.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \ - $(LOCAL_PATH)/newwavelabs/SpringyJalopy.ogg:system/media/audio/ringtones/SpringyJalopy.ogg \ - $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:system/media/audio/ringtones/Steppin_Out.ogg \ - $(LOCAL_PATH)/newwavelabs/Terminated.ogg:system/media/audio/ringtones/Terminated.ogg \ - $(LOCAL_PATH)/ringtones/Testudo.ogg:system/media/audio/ringtones/Testudo.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:system/media/audio/ringtones/Themos.ogg \ - $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:system/media/audio/ringtones/Third_Eye.ogg \ - $(LOCAL_PATH)/newwavelabs/Thunderfoot.ogg:system/media/audio/ringtones/Thunderfoot.ogg \ - $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:system/media/audio/ringtones/TwirlAway.ogg \ - $(LOCAL_PATH)/ringtones/URSAMINOR.ogg:system/media/audio/ringtones/URSAMINOR.ogg \ - $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:system/media/audio/ringtones/UrsaMinor.ogg \ - $(LOCAL_PATH)/newwavelabs/VeryAlarmed.ogg:system/media/audio/ringtones/VeryAlarmed.ogg \ - $(LOCAL_PATH)/ringtones/Vespa.ogg:system/media/audio/ringtones/Vespa.ogg \ - $(LOCAL_PATH)/newwavelabs/World.ogg:system/media/audio/ringtones/World.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:system/media/audio/ringtones/Zeta.ogg \ - $(LOCAL_PATH)/ringtones/hydra.ogg:system/media/audio/ringtones/hydra.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete_120_48k.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn_120_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120_48k.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard_120_48k.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/effects/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/ogg/VideoStop_48k.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:system/media/audio/ui/ChargingStarted.ogg \ - $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:system/media/audio/ui/InCallNotification.ogg \ - $(LOCAL_PATH)/effects/ogg/NFCFailure.ogg:system/media/audio/ui/NFCFailure.ogg \ - $(LOCAL_PATH)/effects/ogg/NFCInitiated.ogg:system/media/audio/ui/NFCInitiated.ogg \ - $(LOCAL_PATH)/effects/ogg/NFCSuccess.ogg:system/media/audio/ui/NFCSuccess.ogg \ - $(LOCAL_PATH)/effects/ogg/NFCTransferComplete.ogg:system/media/audio/ui/NFCTransferComplete.ogg \ - $(LOCAL_PATH)/effects/ogg/NFCTransferInitiated.ogg:system/media/audio/ui/NFCTransferInitiated.ogg \ + $(LOCAL_PATH)/Alarm_Beep_01.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_01.ogg \ + $(LOCAL_PATH)/Alarm_Beep_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_02.ogg \ + $(LOCAL_PATH)/Alarm_Beep_03.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_03.ogg \ + $(LOCAL_PATH)/Alarm_Buzzer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Buzzer.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Classic.ogg \ + $(LOCAL_PATH)/Alarm_Rooster_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Rooster_02.ogg \ + $(LOCAL_PATH)/alarms/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Barium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Barium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Cesium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Fermium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Fermium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Hassium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Hassium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Helium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton.ogg \ + $(LOCAL_PATH)/alarms/ogg/Neon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Neptunium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neptunium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Nobelium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Nobelium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen.ogg \ + $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum.ogg \ + $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Plutonium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Promethium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Promethium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Scandium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Scandium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \ + $(LOCAL_PATH)/notifications/Aldebaran.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Aldebaran.ogg \ + $(LOCAL_PATH)/notifications/Altair.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Altair.ogg \ + $(LOCAL_PATH)/notifications/ogg/Alya.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Alya.ogg \ + $(LOCAL_PATH)/notifications/Antares.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Antares.ogg \ + $(LOCAL_PATH)/notifications/ogg/Antimony.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Antimony.ogg \ + $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Arcturus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Argon.ogg \ + $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beat_Box_Android.ogg \ + $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Bellatrix.ogg \ + $(LOCAL_PATH)/notifications/ogg/Beryllium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beryllium.ogg \ + $(LOCAL_PATH)/notifications/Betelgeuse.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Betelgeuse.ogg \ + $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CaffeineSnake.ogg \ + $(LOCAL_PATH)/notifications/Canopus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Canopus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/Castor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Castor.ogg \ + $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Cobalt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Cobalt.ogg \ + $(LOCAL_PATH)/notifications/Cricket.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Cricket.ogg \ + $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DearDeer.ogg \ + $(LOCAL_PATH)/notifications/Deneb.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Deneb.ogg \ + $(LOCAL_PATH)/notifications/Doink.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Doink.ogg \ + $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DontPanic.ogg \ + $(LOCAL_PATH)/notifications/Drip.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Drip.ogg \ + $(LOCAL_PATH)/notifications/Electra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Electra.ogg \ + $(LOCAL_PATH)/F1_MissedCall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_MissedCall.ogg \ + $(LOCAL_PATH)/F1_New_MMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_MMS.ogg \ + $(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \ + $(LOCAL_PATH)/notifications/ogg/Fluorine.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Fluorine.ogg \ + $(LOCAL_PATH)/notifications/Fomalhaut.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Fomalhaut.ogg \ + $(LOCAL_PATH)/notifications/ogg/Gallium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Gallium.ogg \ + $(LOCAL_PATH)/notifications/Heaven.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Heaven.ogg \ + $(LOCAL_PATH)/notifications/ogg/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Helium.ogg \ + $(LOCAL_PATH)/newwavelabs/Highwire.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Highwire.ogg \ + $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Hojus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Iridium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Iridium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Krypton.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Krypton.ogg \ + $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/KzurbSonar.ogg \ + $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Lalande.ogg \ + $(LOCAL_PATH)/notifications/Merope.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Merope.ogg \ + $(LOCAL_PATH)/notifications/ogg/Mira.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mira.ogg \ + $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/OnTheHunt.ogg \ + $(LOCAL_PATH)/notifications/ogg/Palladium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Palladium.ogg \ + $(LOCAL_PATH)/notifications/Plastic_Pipe.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Plastic_Pipe.ogg \ + $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Polaris.ogg \ + $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Proxima.ogg \ + $(LOCAL_PATH)/notifications/ogg/Radon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Radon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Rubidium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Rubidium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Selenium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Selenium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Shaula.ogg \ + $(LOCAL_PATH)/notifications/Sirrah.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Sirrah.ogg \ + $(LOCAL_PATH)/notifications/SpaceSeed.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/SpaceSeed.ogg \ + $(LOCAL_PATH)/notifications/ogg/Spica.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Spica.ogg \ + $(LOCAL_PATH)/notifications/ogg/Strontium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Strontium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Syrma.ogg \ + $(LOCAL_PATH)/notifications/TaDa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/TaDa.ogg \ + $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Talitha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tejat.ogg \ + $(LOCAL_PATH)/notifications/ogg/Thallium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Thallium.ogg \ + $(LOCAL_PATH)/notifications/Tinkerbell.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tinkerbell.ogg \ + $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Upsilon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Vega.ogg \ + $(LOCAL_PATH)/newwavelabs/Voila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Voila.ogg \ + $(LOCAL_PATH)/notifications/ogg/Xenon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Xenon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Zirconium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Zirconium.ogg \ + $(LOCAL_PATH)/notifications/arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/arcturus.ogg \ + $(LOCAL_PATH)/notifications/moonbeam.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/moonbeam.ogg \ + $(LOCAL_PATH)/notifications/pixiedust.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pixiedust.ogg \ + $(LOCAL_PATH)/notifications/pizzicato.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pizzicato.ogg \ + $(LOCAL_PATH)/notifications/regulus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/regulus.ogg \ + $(LOCAL_PATH)/notifications/sirius.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/sirius.ogg \ + $(LOCAL_PATH)/notifications/tweeters.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/tweeters.ogg \ + $(LOCAL_PATH)/notifications/vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/vega.ogg \ + $(LOCAL_PATH)/ringtones/ANDROMEDA.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ANDROMEDA.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Andromeda.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \ + $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Atria.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Atria.ogg \ + $(LOCAL_PATH)/ringtones/BOOTES.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BOOTES.ogg \ + $(LOCAL_PATH)/newwavelabs/Backroad.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Backroad.ogg \ + $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BeatPlucker.ogg \ + $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BentleyDubs.ogg \ + $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Big_Easy.ogg \ + $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BirdLoop.ogg \ + $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Bollywood.ogg \ + $(LOCAL_PATH)/newwavelabs/BussaMove.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BussaMove.ogg \ + $(LOCAL_PATH)/ringtones/CANISMAJOR.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CANISMAJOR.ogg \ + $(LOCAL_PATH)/ringtones/CASSIOPEIA.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CASSIOPEIA.ogg \ + $(LOCAL_PATH)/newwavelabs/Cairo.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cairo.ogg \ + $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Calypso_Steel.ogg \ + $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CanisMajor.ogg \ + $(LOCAL_PATH)/newwavelabs/CaribbeanIce.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CaribbeanIce.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Carina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Centaurus.ogg \ + $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Champagne_Edition.ogg \ + $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Club_Cubano.ogg \ + $(LOCAL_PATH)/newwavelabs/CrayonRock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CrayonRock.ogg \ + $(LOCAL_PATH)/newwavelabs/CrazyDream.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CrazyDream.ogg \ + $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CurveBall.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cygnus.ogg \ + $(LOCAL_PATH)/newwavelabs/DancinFool.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DancinFool.ogg \ + $(LOCAL_PATH)/newwavelabs/Ding.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ding.ogg \ + $(LOCAL_PATH)/newwavelabs/DonMessWivIt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DonMessWivIt.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Draco.ogg \ + $(LOCAL_PATH)/newwavelabs/DreamTheme.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DreamTheme.ogg \ + $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Eastern_Sky.ogg \ + $(LOCAL_PATH)/newwavelabs/Enter_the_Nexus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Enter_the_Nexus.ogg \ + $(LOCAL_PATH)/ringtones/Eridani.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Eridani.ogg \ + $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/EtherShake.ogg \ + $(LOCAL_PATH)/ringtones/FreeFlight.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/FreeFlight.ogg \ + $(LOCAL_PATH)/newwavelabs/FriendlyGhost.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/FriendlyGhost.ogg \ + $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Funk_Yall.ogg \ + $(LOCAL_PATH)/newwavelabs/GameOverGuitar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/GameOverGuitar.ogg \ + $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Gimme_Mo_Town.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Girtab.ogg \ + $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Glacial_Groove.ogg \ + $(LOCAL_PATH)/newwavelabs/Growl.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Growl.ogg \ + $(LOCAL_PATH)/newwavelabs/HalfwayHome.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/HalfwayHome.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Hydra.ogg \ + $(LOCAL_PATH)/newwavelabs/InsertCoin.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/InsertCoin.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Kuma.ogg \ + $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoopyLounge.ogg \ + $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoveFlute.ogg \ + $(LOCAL_PATH)/ringtones/Lyra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Lyra.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Machina.ogg \ + $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MidEvilJaunt.ogg \ + $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MildlyAlarming.ogg \ + $(LOCAL_PATH)/newwavelabs/Nairobi.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Nairobi.ogg \ + $(LOCAL_PATH)/newwavelabs/Nassau.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Nassau.ogg \ + $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/NewPlayer.ogg \ + $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/No_Limits.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises1.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises1.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises2.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises2.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises3.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises3.ogg \ + $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/OrganDub.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Orion.ogg \ + $(LOCAL_PATH)/ringtones/PERSEUS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/PERSEUS.ogg \ + $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Paradise_Island.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pegasus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Perseus.ogg \ + $(LOCAL_PATH)/newwavelabs/Playa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Playa.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pyxis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Rasalas.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rasalas.ogg \ + $(LOCAL_PATH)/newwavelabs/Revelation.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Revelation.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rigel.ogg \ + $(LOCAL_PATH)/Ring_Classic_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Classic_02.ogg \ + $(LOCAL_PATH)/Ring_Digital_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Digital_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_04.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_04.ogg \ + $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Road_Trip.ogg \ + $(LOCAL_PATH)/newwavelabs/RomancingTheTone.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/RomancingTheTone.ogg \ + $(LOCAL_PATH)/newwavelabs/Safari.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Safari.ogg \ + $(LOCAL_PATH)/newwavelabs/Savannah.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Savannah.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Scarabaeus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/newwavelabs/Seville.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Seville.ogg \ + $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Shes_All_That.ogg \ + $(LOCAL_PATH)/newwavelabs/SilkyWay.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SilkyWay.ogg \ + $(LOCAL_PATH)/newwavelabs/SitarVsSitar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SitarVsSitar.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Solarium.ogg \ + $(LOCAL_PATH)/newwavelabs/SpringyJalopy.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SpringyJalopy.ogg \ + $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Steppin_Out.ogg \ + $(LOCAL_PATH)/newwavelabs/Terminated.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Terminated.ogg \ + $(LOCAL_PATH)/ringtones/Testudo.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Testudo.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Themos.ogg \ + $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Third_Eye.ogg \ + $(LOCAL_PATH)/newwavelabs/Thunderfoot.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Thunderfoot.ogg \ + $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/TwirlAway.ogg \ + $(LOCAL_PATH)/ringtones/URSAMINOR.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/URSAMINOR.ogg \ + $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/UrsaMinor.ogg \ + $(LOCAL_PATH)/newwavelabs/VeryAlarmed.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/VeryAlarmed.ogg \ + $(LOCAL_PATH)/ringtones/Vespa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Vespa.ogg \ + $(LOCAL_PATH)/newwavelabs/World.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/World.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zeta.ogg \ + $(LOCAL_PATH)/ringtones/hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/hydra.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/effects/ogg/VideoRecord_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/ogg/VideoStop_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/WirelessChargingStarted.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/ChargingStarted.ogg \ + $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/InCallNotification.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCFailure.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/NFCFailure.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCInitiated.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/NFCInitiated.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCSuccess.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/NFCSuccess.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCTransferComplete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/NFCTransferComplete.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCTransferInitiated.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/NFCTransferInitiated.ogg \ diff --git a/data/sounds/AudioPackage10.mk b/data/sounds/AudioPackage10.mk index 72aa7fe1c38a..699dbd68048d 100644 --- a/data/sounds/AudioPackage10.mk +++ b/data/sounds/AudioPackage10.mk @@ -8,63 +8,63 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/alarms/ogg/Argon.ogg:system/media/audio/alarms/Argon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:system/media/audio/alarms/Carbon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Helium.ogg:system/media/audio/alarms/Helium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:system/media/audio/alarms/Krypton.ogg \ - $(LOCAL_PATH)/alarms/ogg/Neon.ogg:system/media/audio/alarms/Neon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:system/media/audio/alarms/Oxygen.ogg \ - $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:system/media/audio/alarms/Osmium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:system/media/audio/alarms/Platinum.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard_48k.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_48k.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete_48k.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoStop_48k.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/material/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/material/ogg/LowBattery_48k.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock_48k.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock_48k.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:system/media/audio/ui/ChargingStarted.ogg \ - $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:system/media/audio/ui/InCallNotification.ogg \ - $(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted_48k.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \ - $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ - $(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \ - $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:system/media/audio/notifications/Hojus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Mira.ogg:system/media/audio/notifications/Mira.ogg \ - $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:system/media/audio/notifications/Shaula.ogg \ - $(LOCAL_PATH)/notifications/ogg/Spica.ogg:system/media/audio/notifications/Spica.ogg \ - $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:system/media/audio/notifications/Syrma.ogg \ - $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:system/media/audio/notifications/Talitha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:system/media/audio/notifications/Tejat.ogg \ - $(LOCAL_PATH)/notifications/ogg/Vega.ogg:system/media/audio/notifications/Vega.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:system/media/audio/ringtones/Andromeda.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Atria.ogg:system/media/audio/ringtones/Atria.ogg \ - $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:system/media/audio/ringtones/Girtab.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:system/media/audio/ringtones/Hydra.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:system/media/audio/ringtones/Kuma.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:system/media/audio/ringtones/Machina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:system/media/audio/ringtones/Orion.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Rasalas.ogg:system/media/audio/ringtones/Rasalas.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:system/media/audio/ringtones/Themos.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:system/media/audio/ringtones/Zeta.ogg + $(LOCAL_PATH)/alarms/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Helium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton.ogg \ + $(LOCAL_PATH)/alarms/ogg/Neon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen.ogg \ + $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoStop_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/material/ogg/camera_click_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/material/ogg/LowBattery_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/ChargingStarted.ogg \ + $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/InCallNotification.ogg \ + $(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/WirelessChargingStarted.ogg \ + $(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \ + $(LOCAL_PATH)/notifications/ogg/Alya.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Alya.ogg \ + $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Arcturus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Hojus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Mira.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mira.ogg \ + $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Shaula.ogg \ + $(LOCAL_PATH)/notifications/ogg/Spica.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Spica.ogg \ + $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Syrma.ogg \ + $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Talitha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tejat.ogg \ + $(LOCAL_PATH)/notifications/ogg/Vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Vega.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Andromeda.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Atria.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Atria.ogg \ + $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Centaurus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Girtab.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Hydra.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Kuma.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Machina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Orion.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pegasus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pyxis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Rasalas.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rasalas.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Scarabaeus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Solarium.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Themos.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zeta.ogg diff --git a/data/sounds/AudioPackage11.mk b/data/sounds/AudioPackage11.mk index 665ce521690e..99dfd0a6d455 100644 --- a/data/sounds/AudioPackage11.mk +++ b/data/sounds/AudioPackage11.mk @@ -8,63 +8,63 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/alarms/ogg/Argon.ogg:system/media/audio/alarms/Argon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:system/media/audio/alarms/Carbon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Helium.ogg:system/media/audio/alarms/Helium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:system/media/audio/alarms/Krypton.ogg \ - $(LOCAL_PATH)/alarms/ogg/Neon.ogg:system/media/audio/alarms/Neon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:system/media/audio/alarms/Oxygen.ogg \ - $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:system/media/audio/alarms/Osmium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:system/media/audio/alarms/Platinum.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard_48k.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_48k.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete_48k.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoStop_48k.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/material/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/material/ogg/LowBattery_48k.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock_48k.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock_48k.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:system/media/audio/ui/ChargingStarted.ogg \. - $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:system/media/audio/ui/InCallNotification.ogg \ - $(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted_48k.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \ - $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ - $(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \ - $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:system/media/audio/notifications/Hojus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Mira.ogg:system/media/audio/notifications/Mira.ogg \ - $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:system/media/audio/notifications/Shaula.ogg \ - $(LOCAL_PATH)/notifications/ogg/Spica.ogg:system/media/audio/notifications/Spica.ogg \ - $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:system/media/audio/notifications/Syrma.ogg \ - $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:system/media/audio/notifications/Talitha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Tejat_proc48.ogg:system/media/audio/notifications/Tejat.ogg \ - $(LOCAL_PATH)/notifications/ogg/Vega.ogg:system/media/audio/notifications/Vega.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:system/media/audio/ringtones/Andromeda.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Atria.ogg:system/media/audio/ringtones/Atria.ogg \ - $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:system/media/audio/ringtones/Girtab.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:system/media/audio/ringtones/Hydra.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:system/media/audio/ringtones/Kuma.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:system/media/audio/ringtones/Machina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:system/media/audio/ringtones/Orion.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Rasalas.ogg:system/media/audio/ringtones/Rasalas.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:system/media/audio/ringtones/Themos.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:system/media/audio/ringtones/Zeta.ogg + $(LOCAL_PATH)/alarms/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Helium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton.ogg \ + $(LOCAL_PATH)/alarms/ogg/Neon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen.ogg \ + $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoStop_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/material/ogg/camera_click_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/material/ogg/LowBattery_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/ChargingStarted.ogg \. + $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/InCallNotification.ogg \ + $(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/WirelessChargingStarted.ogg \ + $(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \ + $(LOCAL_PATH)/notifications/ogg/Alya.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Alya.ogg \ + $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Arcturus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Hojus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Mira.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mira.ogg \ + $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Shaula.ogg \ + $(LOCAL_PATH)/notifications/ogg/Spica.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Spica.ogg \ + $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Syrma.ogg \ + $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Talitha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Tejat_proc48.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tejat.ogg \ + $(LOCAL_PATH)/notifications/ogg/Vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Vega.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Andromeda.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Atria.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Atria.ogg \ + $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Centaurus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Girtab.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Hydra.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Kuma.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Machina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Orion.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pegasus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pyxis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Rasalas.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rasalas.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Scarabaeus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Solarium.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Themos.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zeta.ogg diff --git a/data/sounds/AudioPackage12.mk b/data/sounds/AudioPackage12.mk index 44a8f9e34cd3..6159a89e8489 100644 --- a/data/sounds/AudioPackage12.mk +++ b/data/sounds/AudioPackage12.mk @@ -16,15 +16,15 @@ EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete Keypre MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingStarted VideoStop PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ - $(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + $(LOCAL_PATH)/alarms/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ - $(LOCAL_PATH)/notifications/ogg/$(fn).ogg:system/media/audio/notifications/$(fn).ogg) + $(LOCAL_PATH)/notifications/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ - $(LOCAL_PATH)/ringtones/ogg/$(fn).ogg:system/media/audio/ringtones/$(fn).ogg) + $(LOCAL_PATH)/ringtones/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ - $(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\ - $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) diff --git a/data/sounds/AudioPackage12_48.mk b/data/sounds/AudioPackage12_48.mk index 09fab041505e..2899cd160d24 100644 --- a/data/sounds/AudioPackage12_48.mk +++ b/data/sounds/AudioPackage12_48.mk @@ -17,21 +17,21 @@ MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingSta # Alarms not yet available in 48 kHz PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ - $(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + $(LOCAL_PATH)/alarms/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ - $(LOCAL_PATH)/notifications/ogg/$(fn)_48k.ogg:system/media/audio/notifications/$(fn).ogg) + $(LOCAL_PATH)/notifications/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ - $(LOCAL_PATH)/ringtones/ogg/$(fn)_48k.ogg:system/media/audio/ringtones/$(fn).ogg) + $(LOCAL_PATH)/ringtones/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ - $(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\ - $(LOCAL_PATH)/effects/material/ogg/$(fn)_48k.ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/material/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) # no gold-plated version yet PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg diff --git a/data/sounds/AudioPackage13.mk b/data/sounds/AudioPackage13.mk index de4ee047986d..9423c0b9ba5b 100644 --- a/data/sounds/AudioPackage13.mk +++ b/data/sounds/AudioPackage13.mk @@ -17,15 +17,15 @@ EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete Keypre MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery VideoStop PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ - $(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + $(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ - $(LOCAL_PATH)/notifications/material/ogg/$(fn).ogg:system/media/audio/notifications/$(fn).ogg) + $(LOCAL_PATH)/notifications/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ - $(LOCAL_PATH)/ringtones/material/ogg/$(fn).ogg:system/media/audio/ringtones/$(fn).ogg) + $(LOCAL_PATH)/ringtones/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ - $(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\ - $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) diff --git a/data/sounds/AudioPackage13_48.mk b/data/sounds/AudioPackage13_48.mk index 889d58172290..806c4e26152b 100644 --- a/data/sounds/AudioPackage13_48.mk +++ b/data/sounds/AudioPackage13_48.mk @@ -17,21 +17,21 @@ EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete Keypre MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery VideoStop PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ - $(LOCAL_PATH)/alarms/material/ogg/$(fn)_48k.ogg:system/media/audio/alarms/$(fn).ogg) + $(LOCAL_PATH)/alarms/material/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ - $(LOCAL_PATH)/notifications/material/ogg/$(fn)_48k.ogg:system/media/audio/notifications/$(fn).ogg) + $(LOCAL_PATH)/notifications/material/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ - $(LOCAL_PATH)/ringtones/material/ogg/$(fn)_48k.ogg:system/media/audio/ringtones/$(fn).ogg) + $(LOCAL_PATH)/ringtones/material/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ - $(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\ - $(LOCAL_PATH)/effects/material/ogg/$(fn)_48k.ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/material/ogg/$(fn)_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) # no gold-plated version yet PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg diff --git a/data/sounds/AudioPackage14.mk b/data/sounds/AudioPackage14.mk index c903a2b0eb97..3d161aabbf95 100644 --- a/data/sounds/AudioPackage14.mk +++ b/data/sounds/AudioPackage14.mk @@ -18,15 +18,15 @@ EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete Keypre MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery VideoStop PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ - $(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + $(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ - $(LOCAL_PATH)/notifications/material/ogg/$(fn).ogg:system/media/audio/notifications/$(fn).ogg) + $(LOCAL_PATH)/notifications/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ - $(LOCAL_PATH)/ringtones/material/ogg/$(fn).ogg:system/media/audio/ringtones/$(fn).ogg) + $(LOCAL_PATH)/ringtones/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ - $(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\ - $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) + $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg) diff --git a/data/sounds/AudioPackage2.mk b/data/sounds/AudioPackage2.mk index 40319c4505ec..bc4e8fbe811a 100644 --- a/data/sounds/AudioPackage2.mk +++ b/data/sounds/AudioPackage2.mk @@ -10,98 +10,98 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/F1_MissedCall.ogg:system/media/audio/notifications/F1_MissedCall.ogg \ - $(LOCAL_PATH)/F1_New_MMS.ogg:system/media/audio/notifications/F1_New_MMS.ogg \ - $(LOCAL_PATH)/F1_New_SMS.ogg:system/media/audio/notifications/F1_New_SMS.ogg \ - $(LOCAL_PATH)/Alarm_Buzzer.ogg:system/media/audio/alarms/Alarm_Buzzer.ogg \ - $(LOCAL_PATH)/Alarm_Beep_01.ogg:system/media/audio/alarms/Alarm_Beep_01.ogg \ - $(LOCAL_PATH)/Alarm_Beep_02.ogg:system/media/audio/alarms/Alarm_Beep_02.ogg \ - $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ - $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ - $(LOCAL_PATH)/Alarm_Rooster_02.ogg:system/media/audio/alarms/Alarm_Rooster_02.ogg \ - $(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \ - $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ - $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \ - $(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.ogg \ - $(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \ - $(LOCAL_PATH)/notifications/Tinkerbell.ogg:system/media/audio/notifications/Tinkerbell.ogg \ - $(LOCAL_PATH)/effects/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \ - $(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \ - $(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \ - $(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg \ - $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \ - $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg + $(LOCAL_PATH)/F1_MissedCall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_MissedCall.ogg \ + $(LOCAL_PATH)/F1_New_MMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_MMS.ogg \ + $(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \ + $(LOCAL_PATH)/Alarm_Buzzer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Buzzer.ogg \ + $(LOCAL_PATH)/Alarm_Beep_01.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_01.ogg \ + $(LOCAL_PATH)/Alarm_Beep_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_02.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Classic.ogg \ + $(LOCAL_PATH)/Alarm_Beep_03.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_03.ogg \ + $(LOCAL_PATH)/Alarm_Rooster_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Rooster_02.ogg \ + $(LOCAL_PATH)/Ring_Classic_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Classic_02.ogg \ + $(LOCAL_PATH)/Ring_Digital_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Digital_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_04.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_04.ogg \ + $(LOCAL_PATH)/Ring_Synth_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_02.ogg \ + $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beat_Box_Android.ogg \ + $(LOCAL_PATH)/notifications/Heaven.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Heaven.ogg \ + $(LOCAL_PATH)/notifications/TaDa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/TaDa.ogg \ + $(LOCAL_PATH)/notifications/Tinkerbell.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tinkerbell.ogg \ + $(LOCAL_PATH)/effects/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/moonbeam.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/moonbeam.ogg \ + $(LOCAL_PATH)/notifications/pixiedust.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pixiedust.ogg \ + $(LOCAL_PATH)/notifications/pizzicato.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pizzicato.ogg \ + $(LOCAL_PATH)/notifications/tweeters.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/tweeters.ogg \ + $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BeatPlucker.ogg \ + $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CaffeineSnake.ogg ifneq ($(MINIMAL_NEWWAVELABS),true) PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:system/media/audio/ringtones/BentleyDubs.ogg \ - $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ - $(LOCAL_PATH)/newwavelabs/CaribbeanIce.ogg:system/media/audio/ringtones/CaribbeanIce.ogg \ - $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:system/media/audio/ringtones/CurveBall.ogg \ - $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:system/media/audio/ringtones/EtherShake.ogg \ - $(LOCAL_PATH)/newwavelabs/FriendlyGhost.ogg:system/media/audio/ringtones/FriendlyGhost.ogg \ - $(LOCAL_PATH)/newwavelabs/GameOverGuitar.ogg:system/media/audio/ringtones/GameOverGuitar.ogg \ - $(LOCAL_PATH)/newwavelabs/Growl.ogg:system/media/audio/ringtones/Growl.ogg \ - $(LOCAL_PATH)/newwavelabs/InsertCoin.ogg:system/media/audio/ringtones/InsertCoin.ogg \ - $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:system/media/audio/ringtones/LoopyLounge.ogg \ - $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:system/media/audio/ringtones/LoveFlute.ogg \ - $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:system/media/audio/ringtones/MidEvilJaunt.ogg \ - $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:system/media/audio/ringtones/MildlyAlarming.ogg \ - $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:system/media/audio/ringtones/NewPlayer.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises1.ogg:system/media/audio/ringtones/Noises1.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises2.ogg:system/media/audio/ringtones/Noises2.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises3.ogg:system/media/audio/ringtones/Noises3.ogg \ - $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:system/media/audio/ringtones/OrganDub.ogg \ - $(LOCAL_PATH)/newwavelabs/RomancingTheTone.ogg:system/media/audio/ringtones/RomancingTheTone.ogg \ - $(LOCAL_PATH)/newwavelabs/SitarVsSitar.ogg:system/media/audio/ringtones/SitarVsSitar.ogg \ - $(LOCAL_PATH)/newwavelabs/SpringyJalopy.ogg:system/media/audio/ringtones/SpringyJalopy.ogg \ - $(LOCAL_PATH)/newwavelabs/Terminated.ogg:system/media/audio/ringtones/Terminated.ogg \ - $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:system/media/audio/ringtones/TwirlAway.ogg \ - $(LOCAL_PATH)/newwavelabs/VeryAlarmed.ogg:system/media/audio/ringtones/VeryAlarmed.ogg \ - $(LOCAL_PATH)/newwavelabs/World.ogg:system/media/audio/ringtones/World.ogg \ - $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:system/media/audio/notifications/DearDeer.ogg \ - $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:system/media/audio/notifications/DontPanic.ogg \ - $(LOCAL_PATH)/newwavelabs/Highwire.ogg:system/media/audio/notifications/Highwire.ogg \ - $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:system/media/audio/notifications/KzurbSonar.ogg \ - $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:system/media/audio/notifications/OnTheHunt.ogg \ - $(LOCAL_PATH)/newwavelabs/Voila.ogg:system/media/audio/notifications/Voila.ogg \ - $(LOCAL_PATH)/newwavelabs/CrazyDream.ogg:system/media/audio/ringtones/CrazyDream.ogg \ - $(LOCAL_PATH)/newwavelabs/DreamTheme.ogg:system/media/audio/ringtones/DreamTheme.ogg \ - $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:system/media/audio/ringtones/Big_Easy.ogg \ - $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:system/media/audio/ringtones/Bollywood.ogg \ - $(LOCAL_PATH)/newwavelabs/Cairo.ogg:system/media/audio/ringtones/Cairo.ogg \ - $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:system/media/audio/ringtones/Calypso_Steel.ogg \ - $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:system/media/audio/ringtones/Champagne_Edition.ogg \ - $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:system/media/audio/ringtones/Club_Cubano.ogg \ - $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:system/media/audio/ringtones/Eastern_Sky.ogg \ - $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:system/media/audio/ringtones/Funk_Yall.ogg \ - $(LOCAL_PATH)/newwavelabs/Savannah.ogg:system/media/audio/ringtones/Savannah.ogg \ - $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:system/media/audio/ringtones/Gimme_Mo_Town.ogg \ - $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:system/media/audio/ringtones/Glacial_Groove.ogg \ - $(LOCAL_PATH)/newwavelabs/Seville.ogg:system/media/audio/ringtones/Seville.ogg \ - $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:system/media/audio/ringtones/No_Limits.ogg \ - $(LOCAL_PATH)/newwavelabs/Revelation.ogg:system/media/audio/ringtones/Revelation.ogg \ - $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:system/media/audio/ringtones/Paradise_Island.ogg \ - $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:system/media/audio/ringtones/Road_Trip.ogg \ - $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:system/media/audio/ringtones/Shes_All_That.ogg \ - $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:system/media/audio/ringtones/Steppin_Out.ogg \ - $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:system/media/audio/ringtones/Third_Eye.ogg \ - $(LOCAL_PATH)/newwavelabs/Thunderfoot.ogg:system/media/audio/ringtones/Thunderfoot.ogg + $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BentleyDubs.ogg \ + $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BirdLoop.ogg \ + $(LOCAL_PATH)/newwavelabs/CaribbeanIce.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CaribbeanIce.ogg \ + $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CurveBall.ogg \ + $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/EtherShake.ogg \ + $(LOCAL_PATH)/newwavelabs/FriendlyGhost.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/FriendlyGhost.ogg \ + $(LOCAL_PATH)/newwavelabs/GameOverGuitar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/GameOverGuitar.ogg \ + $(LOCAL_PATH)/newwavelabs/Growl.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Growl.ogg \ + $(LOCAL_PATH)/newwavelabs/InsertCoin.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/InsertCoin.ogg \ + $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoopyLounge.ogg \ + $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoveFlute.ogg \ + $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MidEvilJaunt.ogg \ + $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MildlyAlarming.ogg \ + $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/NewPlayer.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises1.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises1.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises2.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises2.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises3.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises3.ogg \ + $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/OrganDub.ogg \ + $(LOCAL_PATH)/newwavelabs/RomancingTheTone.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/RomancingTheTone.ogg \ + $(LOCAL_PATH)/newwavelabs/SitarVsSitar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SitarVsSitar.ogg \ + $(LOCAL_PATH)/newwavelabs/SpringyJalopy.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SpringyJalopy.ogg \ + $(LOCAL_PATH)/newwavelabs/Terminated.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Terminated.ogg \ + $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/TwirlAway.ogg \ + $(LOCAL_PATH)/newwavelabs/VeryAlarmed.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/VeryAlarmed.ogg \ + $(LOCAL_PATH)/newwavelabs/World.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/World.ogg \ + $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DearDeer.ogg \ + $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DontPanic.ogg \ + $(LOCAL_PATH)/newwavelabs/Highwire.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Highwire.ogg \ + $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/KzurbSonar.ogg \ + $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/OnTheHunt.ogg \ + $(LOCAL_PATH)/newwavelabs/Voila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Voila.ogg \ + $(LOCAL_PATH)/newwavelabs/CrazyDream.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CrazyDream.ogg \ + $(LOCAL_PATH)/newwavelabs/DreamTheme.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DreamTheme.ogg \ + $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Big_Easy.ogg \ + $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Bollywood.ogg \ + $(LOCAL_PATH)/newwavelabs/Cairo.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cairo.ogg \ + $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Calypso_Steel.ogg \ + $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Champagne_Edition.ogg \ + $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Club_Cubano.ogg \ + $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Eastern_Sky.ogg \ + $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Funk_Yall.ogg \ + $(LOCAL_PATH)/newwavelabs/Savannah.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Savannah.ogg \ + $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Gimme_Mo_Town.ogg \ + $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Glacial_Groove.ogg \ + $(LOCAL_PATH)/newwavelabs/Seville.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Seville.ogg \ + $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/No_Limits.ogg \ + $(LOCAL_PATH)/newwavelabs/Revelation.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Revelation.ogg \ + $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Paradise_Island.ogg \ + $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Road_Trip.ogg \ + $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Shes_All_That.ogg \ + $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Steppin_Out.ogg \ + $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Third_Eye.ogg \ + $(LOCAL_PATH)/newwavelabs/Thunderfoot.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Thunderfoot.ogg endif diff --git a/data/sounds/AudioPackage3.mk b/data/sounds/AudioPackage3.mk index a05de723c8f1..a98fb74a0f2a 100644 --- a/data/sounds/AudioPackage3.mk +++ b/data/sounds/AudioPackage3.mk @@ -10,94 +10,94 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/F1_MissedCall.ogg:system/media/audio/notifications/F1_MissedCall.ogg \ - $(LOCAL_PATH)/F1_New_MMS.ogg:system/media/audio/notifications/F1_New_MMS.ogg \ - $(LOCAL_PATH)/F1_New_SMS.ogg:system/media/audio/notifications/F1_New_SMS.ogg \ - $(LOCAL_PATH)/Alarm_Buzzer.ogg:system/media/audio/alarms/Alarm_Buzzer.ogg \ - $(LOCAL_PATH)/Alarm_Beep_01.ogg:system/media/audio/alarms/Alarm_Beep_01.ogg \ - $(LOCAL_PATH)/Alarm_Beep_02.ogg:system/media/audio/alarms/Alarm_Beep_02.ogg \ - $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ - $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ - $(LOCAL_PATH)/Alarm_Rooster_02.ogg:system/media/audio/alarms/Alarm_Rooster_02.ogg \ - $(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \ - $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ - $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \ - $(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.ogg \ - $(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \ - $(LOCAL_PATH)/notifications/Tinkerbell.ogg:system/media/audio/notifications/Tinkerbell.ogg \ - $(LOCAL_PATH)/effects/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \ - $(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \ - $(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \ - $(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg \ - $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \ - $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg + $(LOCAL_PATH)/F1_MissedCall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_MissedCall.ogg \ + $(LOCAL_PATH)/F1_New_MMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_MMS.ogg \ + $(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \ + $(LOCAL_PATH)/Alarm_Buzzer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Buzzer.ogg \ + $(LOCAL_PATH)/Alarm_Beep_01.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_01.ogg \ + $(LOCAL_PATH)/Alarm_Beep_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_02.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Classic.ogg \ + $(LOCAL_PATH)/Alarm_Beep_03.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_03.ogg \ + $(LOCAL_PATH)/Alarm_Rooster_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Rooster_02.ogg \ + $(LOCAL_PATH)/Ring_Classic_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Classic_02.ogg \ + $(LOCAL_PATH)/Ring_Digital_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Digital_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_04.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_04.ogg \ + $(LOCAL_PATH)/Ring_Synth_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_02.ogg \ + $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beat_Box_Android.ogg \ + $(LOCAL_PATH)/notifications/Heaven.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Heaven.ogg \ + $(LOCAL_PATH)/notifications/TaDa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/TaDa.ogg \ + $(LOCAL_PATH)/notifications/Tinkerbell.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tinkerbell.ogg \ + $(LOCAL_PATH)/effects/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/moonbeam.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/moonbeam.ogg \ + $(LOCAL_PATH)/notifications/pixiedust.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pixiedust.ogg \ + $(LOCAL_PATH)/notifications/pizzicato.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pizzicato.ogg \ + $(LOCAL_PATH)/notifications/tweeters.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/tweeters.ogg \ + $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BeatPlucker.ogg \ + $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CaffeineSnake.ogg ifneq ($(MINIMAL_NEWWAVELABS),true) PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:system/media/audio/ringtones/BentleyDubs.ogg \ - $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ - $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:system/media/audio/ringtones/CurveBall.ogg \ - $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:system/media/audio/ringtones/EtherShake.ogg \ - $(LOCAL_PATH)/newwavelabs/Growl.ogg:system/media/audio/ringtones/Growl.ogg \ - $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:system/media/audio/ringtones/LoopyLounge.ogg \ - $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:system/media/audio/ringtones/LoveFlute.ogg \ - $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:system/media/audio/ringtones/MidEvilJaunt.ogg \ - $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:system/media/audio/ringtones/MildlyAlarming.ogg \ - $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:system/media/audio/ringtones/NewPlayer.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises1.ogg:system/media/audio/ringtones/Noises1.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises2.ogg:system/media/audio/ringtones/Noises2.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises3.ogg:system/media/audio/ringtones/Noises3.ogg \ - $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:system/media/audio/ringtones/OrganDub.ogg \ - $(LOCAL_PATH)/newwavelabs/Terminated.ogg:system/media/audio/ringtones/Terminated.ogg \ - $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:system/media/audio/ringtones/TwirlAway.ogg \ - $(LOCAL_PATH)/newwavelabs/World.ogg:system/media/audio/ringtones/World.ogg \ - $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:system/media/audio/notifications/DearDeer.ogg \ - $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:system/media/audio/notifications/DontPanic.ogg \ - $(LOCAL_PATH)/newwavelabs/Highwire.ogg:system/media/audio/notifications/Highwire.ogg \ - $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:system/media/audio/notifications/KzurbSonar.ogg \ - $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:system/media/audio/notifications/OnTheHunt.ogg \ - $(LOCAL_PATH)/newwavelabs/Voila.ogg:system/media/audio/notifications/Voila.ogg \ - $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:system/media/audio/ringtones/Big_Easy.ogg \ - $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:system/media/audio/ringtones/Bollywood.ogg \ - $(LOCAL_PATH)/newwavelabs/Cairo.ogg:system/media/audio/ringtones/Cairo.ogg \ - $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:system/media/audio/ringtones/Calypso_Steel.ogg \ - $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:system/media/audio/ringtones/Champagne_Edition.ogg \ - $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:system/media/audio/ringtones/Club_Cubano.ogg \ - $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:system/media/audio/ringtones/Eastern_Sky.ogg \ - $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:system/media/audio/ringtones/Funk_Yall.ogg \ - $(LOCAL_PATH)/newwavelabs/Savannah.ogg:system/media/audio/ringtones/Savannah.ogg \ - $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:system/media/audio/ringtones/Gimme_Mo_Town.ogg \ - $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:system/media/audio/ringtones/Glacial_Groove.ogg \ - $(LOCAL_PATH)/newwavelabs/Seville.ogg:system/media/audio/ringtones/Seville.ogg \ - $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:system/media/audio/ringtones/No_Limits.ogg \ - $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:system/media/audio/ringtones/Paradise_Island.ogg \ - $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:system/media/audio/ringtones/Road_Trip.ogg \ - $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:system/media/audio/ringtones/Shes_All_That.ogg \ - $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:system/media/audio/ringtones/Steppin_Out.ogg \ - $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:system/media/audio/ringtones/Third_Eye.ogg \ - $(LOCAL_PATH)/newwavelabs/Thunderfoot.ogg:system/media/audio/ringtones/Thunderfoot.ogg \ - $(LOCAL_PATH)/newwavelabs/HalfwayHome.ogg:system/media/audio/ringtones/HalfwayHome.ogg \ - $(LOCAL_PATH)/newwavelabs/CrayonRock.ogg:system/media/audio/ringtones/CrayonRock.ogg \ - $(LOCAL_PATH)/newwavelabs/DancinFool.ogg:system/media/audio/ringtones/DancinFool.ogg \ - $(LOCAL_PATH)/newwavelabs/BussaMove.ogg:system/media/audio/ringtones/BussaMove.ogg \ - $(LOCAL_PATH)/newwavelabs/DonMessWivIt.ogg:system/media/audio/ringtones/DonMessWivIt.ogg \ - $(LOCAL_PATH)/newwavelabs/SilkyWay.ogg:system/media/audio/ringtones/SilkyWay.ogg \ - $(LOCAL_PATH)/newwavelabs/Playa.ogg:system/media/audio/ringtones/Playa.ogg + $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BentleyDubs.ogg \ + $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BirdLoop.ogg \ + $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CurveBall.ogg \ + $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/EtherShake.ogg \ + $(LOCAL_PATH)/newwavelabs/Growl.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Growl.ogg \ + $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoopyLounge.ogg \ + $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoveFlute.ogg \ + $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MidEvilJaunt.ogg \ + $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MildlyAlarming.ogg \ + $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/NewPlayer.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises1.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises1.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises2.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises2.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises3.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises3.ogg \ + $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/OrganDub.ogg \ + $(LOCAL_PATH)/newwavelabs/Terminated.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Terminated.ogg \ + $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/TwirlAway.ogg \ + $(LOCAL_PATH)/newwavelabs/World.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/World.ogg \ + $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DearDeer.ogg \ + $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DontPanic.ogg \ + $(LOCAL_PATH)/newwavelabs/Highwire.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Highwire.ogg \ + $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/KzurbSonar.ogg \ + $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/OnTheHunt.ogg \ + $(LOCAL_PATH)/newwavelabs/Voila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Voila.ogg \ + $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Big_Easy.ogg \ + $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Bollywood.ogg \ + $(LOCAL_PATH)/newwavelabs/Cairo.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cairo.ogg \ + $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Calypso_Steel.ogg \ + $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Champagne_Edition.ogg \ + $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Club_Cubano.ogg \ + $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Eastern_Sky.ogg \ + $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Funk_Yall.ogg \ + $(LOCAL_PATH)/newwavelabs/Savannah.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Savannah.ogg \ + $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Gimme_Mo_Town.ogg \ + $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Glacial_Groove.ogg \ + $(LOCAL_PATH)/newwavelabs/Seville.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Seville.ogg \ + $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/No_Limits.ogg \ + $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Paradise_Island.ogg \ + $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Road_Trip.ogg \ + $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Shes_All_That.ogg \ + $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Steppin_Out.ogg \ + $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Third_Eye.ogg \ + $(LOCAL_PATH)/newwavelabs/Thunderfoot.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Thunderfoot.ogg \ + $(LOCAL_PATH)/newwavelabs/HalfwayHome.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/HalfwayHome.ogg \ + $(LOCAL_PATH)/newwavelabs/CrayonRock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CrayonRock.ogg \ + $(LOCAL_PATH)/newwavelabs/DancinFool.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DancinFool.ogg \ + $(LOCAL_PATH)/newwavelabs/BussaMove.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BussaMove.ogg \ + $(LOCAL_PATH)/newwavelabs/DonMessWivIt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DonMessWivIt.ogg \ + $(LOCAL_PATH)/newwavelabs/SilkyWay.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SilkyWay.ogg \ + $(LOCAL_PATH)/newwavelabs/Playa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Playa.ogg endif diff --git a/data/sounds/AudioPackage4.mk b/data/sounds/AudioPackage4.mk index d376a2d91f6c..54c3c025d978 100644 --- a/data/sounds/AudioPackage4.mk +++ b/data/sounds/AudioPackage4.mk @@ -10,98 +10,98 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/F1_MissedCall.ogg:system/media/audio/notifications/F1_MissedCall.ogg \ - $(LOCAL_PATH)/F1_New_MMS.ogg:system/media/audio/notifications/F1_New_MMS.ogg \ - $(LOCAL_PATH)/F1_New_SMS.ogg:system/media/audio/notifications/F1_New_SMS.ogg \ - $(LOCAL_PATH)/Alarm_Buzzer.ogg:system/media/audio/alarms/Alarm_Buzzer.ogg \ - $(LOCAL_PATH)/Alarm_Beep_01.ogg:system/media/audio/alarms/Alarm_Beep_01.ogg \ - $(LOCAL_PATH)/Alarm_Beep_02.ogg:system/media/audio/alarms/Alarm_Beep_02.ogg \ - $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ - $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ - $(LOCAL_PATH)/Alarm_Rooster_02.ogg:system/media/audio/alarms/Alarm_Rooster_02.ogg \ - $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \ - $(LOCAL_PATH)/notifications/Cricket.ogg:system/media/audio/notifications/Cricket.ogg \ - $(LOCAL_PATH)/notifications/Doink.ogg:system/media/audio/notifications/Doink.ogg \ - $(LOCAL_PATH)/notifications/Drip.ogg:system/media/audio/notifications/Drip.ogg \ - $(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.ogg \ - $(LOCAL_PATH)/notifications/SpaceSeed.ogg:system/media/audio/notifications/SpaceSeed.ogg \ - $(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \ - $(LOCAL_PATH)/notifications/Tinkerbell.ogg:system/media/audio/notifications/Tinkerbell.ogg \ - $(LOCAL_PATH)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \ - $(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \ - $(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \ - $(LOCAL_PATH)/notifications/Plastic_Pipe.ogg:system/media/audio/notifications/Plastic_Pipe.ogg \ - $(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg \ - $(LOCAL_PATH)/effects/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \ - $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ - $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/ringtones/FreeFlight.ogg:system/media/audio/ringtones/FreeFlight.ogg \ - $(LOCAL_PATH)/newwavelabs/Backroad.ogg:system/media/audio/ringtones/Backroad.ogg \ - $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg + $(LOCAL_PATH)/F1_MissedCall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_MissedCall.ogg \ + $(LOCAL_PATH)/F1_New_MMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_MMS.ogg \ + $(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \ + $(LOCAL_PATH)/Alarm_Buzzer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Buzzer.ogg \ + $(LOCAL_PATH)/Alarm_Beep_01.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_01.ogg \ + $(LOCAL_PATH)/Alarm_Beep_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_02.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Classic.ogg \ + $(LOCAL_PATH)/Alarm_Beep_03.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_03.ogg \ + $(LOCAL_PATH)/Alarm_Rooster_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Rooster_02.ogg \ + $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beat_Box_Android.ogg \ + $(LOCAL_PATH)/notifications/Cricket.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Cricket.ogg \ + $(LOCAL_PATH)/notifications/Doink.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Doink.ogg \ + $(LOCAL_PATH)/notifications/Drip.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Drip.ogg \ + $(LOCAL_PATH)/notifications/Heaven.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Heaven.ogg \ + $(LOCAL_PATH)/notifications/SpaceSeed.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/SpaceSeed.ogg \ + $(LOCAL_PATH)/notifications/TaDa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/TaDa.ogg \ + $(LOCAL_PATH)/notifications/Tinkerbell.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tinkerbell.ogg \ + $(LOCAL_PATH)/notifications/moonbeam.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/moonbeam.ogg \ + $(LOCAL_PATH)/notifications/pixiedust.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pixiedust.ogg \ + $(LOCAL_PATH)/notifications/pizzicato.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pizzicato.ogg \ + $(LOCAL_PATH)/notifications/Plastic_Pipe.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Plastic_Pipe.ogg \ + $(LOCAL_PATH)/notifications/tweeters.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/tweeters.ogg \ + $(LOCAL_PATH)/effects/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/Ring_Classic_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Classic_02.ogg \ + $(LOCAL_PATH)/Ring_Digital_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Digital_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_04.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_04.ogg \ + $(LOCAL_PATH)/Ring_Synth_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_02.ogg \ + $(LOCAL_PATH)/ringtones/FreeFlight.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/FreeFlight.ogg \ + $(LOCAL_PATH)/newwavelabs/Backroad.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Backroad.ogg \ + $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CaffeineSnake.ogg ifneq ($(MINIMAL_NEWWAVELABS),true) PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:system/media/audio/notifications/DearDeer.ogg \ - $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:system/media/audio/notifications/DontPanic.ogg \ - $(LOCAL_PATH)/newwavelabs/Highwire.ogg:system/media/audio/notifications/Highwire.ogg \ - $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:system/media/audio/notifications/KzurbSonar.ogg \ - $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:system/media/audio/notifications/OnTheHunt.ogg \ - $(LOCAL_PATH)/newwavelabs/Voila.ogg:system/media/audio/notifications/Voila.ogg \ - $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:system/media/audio/ringtones/Big_Easy.ogg \ - $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ - $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:system/media/audio/ringtones/Bollywood.ogg \ - $(LOCAL_PATH)/newwavelabs/BussaMove.ogg:system/media/audio/ringtones/BussaMove.ogg \ - $(LOCAL_PATH)/newwavelabs/Cairo.ogg:system/media/audio/ringtones/Cairo.ogg \ - $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:system/media/audio/ringtones/Calypso_Steel.ogg \ - $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:system/media/audio/ringtones/Champagne_Edition.ogg \ - $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:system/media/audio/ringtones/Club_Cubano.ogg \ - $(LOCAL_PATH)/newwavelabs/CrayonRock.ogg:system/media/audio/ringtones/CrayonRock.ogg \ - $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:system/media/audio/ringtones/CurveBall.ogg \ - $(LOCAL_PATH)/newwavelabs/DancinFool.ogg:system/media/audio/ringtones/DancinFool.ogg \ - $(LOCAL_PATH)/newwavelabs/Ding.ogg:system/media/audio/ringtones/Ding.ogg \ - $(LOCAL_PATH)/newwavelabs/DonMessWivIt.ogg:system/media/audio/ringtones/DonMessWivIt.ogg \ - $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:system/media/audio/ringtones/Eastern_Sky.ogg \ - $(LOCAL_PATH)/newwavelabs/Enter_the_Nexus.ogg:system/media/audio/ringtones/Enter_the_Nexus.ogg \ - $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:system/media/audio/ringtones/EtherShake.ogg \ - $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:system/media/audio/ringtones/Funk_Yall.ogg \ - $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:system/media/audio/ringtones/Gimme_Mo_Town.ogg \ - $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:system/media/audio/ringtones/Glacial_Groove.ogg \ - $(LOCAL_PATH)/newwavelabs/Growl.ogg:system/media/audio/ringtones/Growl.ogg \ - $(LOCAL_PATH)/newwavelabs/HalfwayHome.ogg:system/media/audio/ringtones/HalfwayHome.ogg \ - $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:system/media/audio/ringtones/LoopyLounge.ogg \ - $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:system/media/audio/ringtones/LoveFlute.ogg \ - $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:system/media/audio/ringtones/MidEvilJaunt.ogg \ - $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:system/media/audio/ringtones/MildlyAlarming.ogg \ - $(LOCAL_PATH)/newwavelabs/Nairobi.ogg:system/media/audio/ringtones/Nairobi.ogg \ - $(LOCAL_PATH)/newwavelabs/Nassau.ogg:system/media/audio/ringtones/Nassau.ogg \ - $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:system/media/audio/ringtones/No_Limits.ogg \ - $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:system/media/audio/ringtones/OrganDub.ogg \ - $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:system/media/audio/ringtones/Paradise_Island.ogg \ - $(LOCAL_PATH)/newwavelabs/Playa.ogg:system/media/audio/ringtones/Playa.ogg \ - $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:system/media/audio/ringtones/Road_Trip.ogg \ - $(LOCAL_PATH)/newwavelabs/Safari.ogg:system/media/audio/ringtones/Safari.ogg \ - $(LOCAL_PATH)/newwavelabs/Seville.ogg:system/media/audio/ringtones/Seville.ogg \ - $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:system/media/audio/ringtones/Shes_All_That.ogg \ - $(LOCAL_PATH)/newwavelabs/SilkyWay.ogg:system/media/audio/ringtones/SilkyWay.ogg \ - $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:system/media/audio/ringtones/Steppin_Out.ogg \ - $(LOCAL_PATH)/newwavelabs/Terminated.ogg:system/media/audio/ringtones/Terminated.ogg \ - $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:system/media/audio/ringtones/Third_Eye.ogg \ - $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:system/media/audio/ringtones/TwirlAway.ogg \ - $(LOCAL_PATH)/newwavelabs/World.ogg:system/media/audio/ringtones/World.ogg + $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DearDeer.ogg \ + $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DontPanic.ogg \ + $(LOCAL_PATH)/newwavelabs/Highwire.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Highwire.ogg \ + $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/KzurbSonar.ogg \ + $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/OnTheHunt.ogg \ + $(LOCAL_PATH)/newwavelabs/Voila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Voila.ogg \ + $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Big_Easy.ogg \ + $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BirdLoop.ogg \ + $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Bollywood.ogg \ + $(LOCAL_PATH)/newwavelabs/BussaMove.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BussaMove.ogg \ + $(LOCAL_PATH)/newwavelabs/Cairo.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cairo.ogg \ + $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Calypso_Steel.ogg \ + $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Champagne_Edition.ogg \ + $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Club_Cubano.ogg \ + $(LOCAL_PATH)/newwavelabs/CrayonRock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CrayonRock.ogg \ + $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CurveBall.ogg \ + $(LOCAL_PATH)/newwavelabs/DancinFool.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DancinFool.ogg \ + $(LOCAL_PATH)/newwavelabs/Ding.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ding.ogg \ + $(LOCAL_PATH)/newwavelabs/DonMessWivIt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DonMessWivIt.ogg \ + $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Eastern_Sky.ogg \ + $(LOCAL_PATH)/newwavelabs/Enter_the_Nexus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Enter_the_Nexus.ogg \ + $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/EtherShake.ogg \ + $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Funk_Yall.ogg \ + $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Gimme_Mo_Town.ogg \ + $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Glacial_Groove.ogg \ + $(LOCAL_PATH)/newwavelabs/Growl.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Growl.ogg \ + $(LOCAL_PATH)/newwavelabs/HalfwayHome.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/HalfwayHome.ogg \ + $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoopyLounge.ogg \ + $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoveFlute.ogg \ + $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MidEvilJaunt.ogg \ + $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MildlyAlarming.ogg \ + $(LOCAL_PATH)/newwavelabs/Nairobi.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Nairobi.ogg \ + $(LOCAL_PATH)/newwavelabs/Nassau.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Nassau.ogg \ + $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/No_Limits.ogg \ + $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/OrganDub.ogg \ + $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Paradise_Island.ogg \ + $(LOCAL_PATH)/newwavelabs/Playa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Playa.ogg \ + $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Road_Trip.ogg \ + $(LOCAL_PATH)/newwavelabs/Safari.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Safari.ogg \ + $(LOCAL_PATH)/newwavelabs/Seville.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Seville.ogg \ + $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Shes_All_That.ogg \ + $(LOCAL_PATH)/newwavelabs/SilkyWay.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SilkyWay.ogg \ + $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Steppin_Out.ogg \ + $(LOCAL_PATH)/newwavelabs/Terminated.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Terminated.ogg \ + $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Third_Eye.ogg \ + $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/TwirlAway.ogg \ + $(LOCAL_PATH)/newwavelabs/World.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/World.ogg endif diff --git a/data/sounds/AudioPackage5.mk b/data/sounds/AudioPackage5.mk index 72384c8b9146..8a03a2e1eb1d 100644 --- a/data/sounds/AudioPackage5.mk +++ b/data/sounds/AudioPackage5.mk @@ -8,69 +8,69 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/Alarm_Buzzer.ogg:system/media/audio/alarms/Alarm_Buzzer.ogg \ - $(LOCAL_PATH)/Alarm_Beep_01.ogg:system/media/audio/alarms/Alarm_Beep_01.ogg \ - $(LOCAL_PATH)/Alarm_Beep_02.ogg:system/media/audio/alarms/Alarm_Beep_02.ogg \ - $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ - $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ - $(LOCAL_PATH)/effects/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/Aldebaran.ogg:system/media/audio/notifications/Aldebaran.ogg \ - $(LOCAL_PATH)/notifications/Altair.ogg:system/media/audio/notifications/Altair.ogg \ - $(LOCAL_PATH)/notifications/Antares.ogg:system/media/audio/notifications/Antares.ogg \ - $(LOCAL_PATH)/notifications/arcturus.ogg:system/media/audio/notifications/arcturus.ogg \ - $(LOCAL_PATH)/notifications/Betelgeuse.ogg:system/media/audio/notifications/Betelgeuse.ogg \ - $(LOCAL_PATH)/notifications/Canopus.ogg:system/media/audio/notifications/Canopus.ogg \ - $(LOCAL_PATH)/notifications/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/Castor.ogg:system/media/audio/notifications/Castor.ogg \ - $(LOCAL_PATH)/notifications/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/Deneb.ogg:system/media/audio/notifications/Deneb.ogg \ - $(LOCAL_PATH)/notifications/Electra.ogg:system/media/audio/notifications/Electra.ogg \ - $(LOCAL_PATH)/notifications/Fomalhaut.ogg:system/media/audio/notifications/Fomalhaut.ogg \ - $(LOCAL_PATH)/notifications/Merope.ogg:system/media/audio/notifications/Merope.ogg \ - $(LOCAL_PATH)/notifications/Polaris.ogg:system/media/audio/notifications/Polaris.ogg \ - $(LOCAL_PATH)/notifications/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/regulus.ogg:system/media/audio/notifications/regulus.ogg \ - $(LOCAL_PATH)/notifications/sirius.ogg:system/media/audio/notifications/sirius.ogg \ - $(LOCAL_PATH)/notifications/Sirrah.ogg:system/media/audio/notifications/Sirrah.ogg \ - $(LOCAL_PATH)/notifications/vega.ogg:system/media/audio/notifications/vega.ogg \ - $(LOCAL_PATH)/ringtones/ANDROMEDA.ogg:system/media/audio/ringtones/ANDROMEDA.ogg \ - $(LOCAL_PATH)/ringtones/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ - $(LOCAL_PATH)/ringtones/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ - $(LOCAL_PATH)/ringtones/BOOTES.ogg:system/media/audio/ringtones/BOOTES.ogg \ - $(LOCAL_PATH)/ringtones/CANISMAJOR.ogg:system/media/audio/ringtones/CANISMAJOR.ogg \ - $(LOCAL_PATH)/ringtones/Carina.ogg:system/media/audio/ringtones/Carina.ogg \ - $(LOCAL_PATH)/ringtones/CASSIOPEIA.ogg:system/media/audio/ringtones/CASSIOPEIA.ogg \ - $(LOCAL_PATH)/ringtones/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \ - $(LOCAL_PATH)/ringtones/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \ - $(LOCAL_PATH)/ringtones/Draco.ogg:system/media/audio/ringtones/Draco.ogg \ - $(LOCAL_PATH)/ringtones/Eridani.ogg:system/media/audio/ringtones/Eridani.ogg \ - $(LOCAL_PATH)/ringtones/hydra.ogg:system/media/audio/ringtones/hydra.ogg \ - $(LOCAL_PATH)/ringtones/Lyra.ogg:system/media/audio/ringtones/Lyra.ogg \ - $(LOCAL_PATH)/ringtones/Machina.ogg:system/media/audio/ringtones/Machina.ogg \ - $(LOCAL_PATH)/ringtones/Orion.ogg:system/media/audio/ringtones/Orion.ogg \ - $(LOCAL_PATH)/ringtones/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \ - $(LOCAL_PATH)/ringtones/PERSEUS.ogg:system/media/audio/ringtones/PERSEUS.ogg \ - $(LOCAL_PATH)/ringtones/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \ - $(LOCAL_PATH)/ringtones/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \ - $(LOCAL_PATH)/ringtones/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \ - $(LOCAL_PATH)/ringtones/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ - $(LOCAL_PATH)/ringtones/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \ - $(LOCAL_PATH)/ringtones/Testudo.ogg:system/media/audio/ringtones/Testudo.ogg \ - $(LOCAL_PATH)/ringtones/URSAMINOR.ogg:system/media/audio/ringtones/URSAMINOR.ogg \ - $(LOCAL_PATH)/ringtones/Vespa.ogg:system/media/audio/ringtones/Vespa.ogg + $(LOCAL_PATH)/Alarm_Buzzer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Buzzer.ogg \ + $(LOCAL_PATH)/Alarm_Beep_01.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_01.ogg \ + $(LOCAL_PATH)/Alarm_Beep_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_02.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Classic.ogg \ + $(LOCAL_PATH)/Alarm_Beep_03.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_03.ogg \ + $(LOCAL_PATH)/effects/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/Aldebaran.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Aldebaran.ogg \ + $(LOCAL_PATH)/notifications/Altair.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Altair.ogg \ + $(LOCAL_PATH)/notifications/Antares.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Antares.ogg \ + $(LOCAL_PATH)/notifications/arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/arcturus.ogg \ + $(LOCAL_PATH)/notifications/Betelgeuse.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Betelgeuse.ogg \ + $(LOCAL_PATH)/notifications/Canopus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Canopus.ogg \ + $(LOCAL_PATH)/notifications/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/Castor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Castor.ogg \ + $(LOCAL_PATH)/notifications/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/Deneb.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Deneb.ogg \ + $(LOCAL_PATH)/notifications/Electra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Electra.ogg \ + $(LOCAL_PATH)/notifications/Fomalhaut.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Fomalhaut.ogg \ + $(LOCAL_PATH)/notifications/Merope.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Merope.ogg \ + $(LOCAL_PATH)/notifications/Polaris.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Polaris.ogg \ + $(LOCAL_PATH)/notifications/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/regulus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/regulus.ogg \ + $(LOCAL_PATH)/notifications/sirius.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/sirius.ogg \ + $(LOCAL_PATH)/notifications/Sirrah.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Sirrah.ogg \ + $(LOCAL_PATH)/notifications/vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/vega.ogg \ + $(LOCAL_PATH)/ringtones/ANDROMEDA.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ANDROMEDA.ogg \ + $(LOCAL_PATH)/ringtones/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \ + $(LOCAL_PATH)/ringtones/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \ + $(LOCAL_PATH)/ringtones/BOOTES.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BOOTES.ogg \ + $(LOCAL_PATH)/ringtones/CANISMAJOR.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CANISMAJOR.ogg \ + $(LOCAL_PATH)/ringtones/Carina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Carina.ogg \ + $(LOCAL_PATH)/ringtones/CASSIOPEIA.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CASSIOPEIA.ogg \ + $(LOCAL_PATH)/ringtones/Centaurus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Centaurus.ogg \ + $(LOCAL_PATH)/ringtones/Cygnus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cygnus.ogg \ + $(LOCAL_PATH)/ringtones/Draco.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Draco.ogg \ + $(LOCAL_PATH)/ringtones/Eridani.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Eridani.ogg \ + $(LOCAL_PATH)/ringtones/hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/hydra.ogg \ + $(LOCAL_PATH)/ringtones/Lyra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Lyra.ogg \ + $(LOCAL_PATH)/ringtones/Machina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Machina.ogg \ + $(LOCAL_PATH)/ringtones/Orion.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Orion.ogg \ + $(LOCAL_PATH)/ringtones/Pegasus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pegasus.ogg \ + $(LOCAL_PATH)/ringtones/PERSEUS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/PERSEUS.ogg \ + $(LOCAL_PATH)/ringtones/Pyxis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pyxis.ogg \ + $(LOCAL_PATH)/ringtones/Rigel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rigel.ogg \ + $(LOCAL_PATH)/ringtones/Scarabaeus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Scarabaeus.ogg \ + $(LOCAL_PATH)/ringtones/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/ringtones/Solarium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Solarium.ogg \ + $(LOCAL_PATH)/ringtones/Testudo.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Testudo.ogg \ + $(LOCAL_PATH)/ringtones/URSAMINOR.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/URSAMINOR.ogg \ + $(LOCAL_PATH)/ringtones/Vespa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Vespa.ogg diff --git a/data/sounds/AudioPackage6.mk b/data/sounds/AudioPackage6.mk index 5413704f0fac..a778261c0a22 100644 --- a/data/sounds/AudioPackage6.mk +++ b/data/sounds/AudioPackage6.mk @@ -8,41 +8,41 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/alarms/ogg/Barium.ogg:system/media/audio/alarms/Barium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:system/media/audio/alarms/Cesium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:system/media/audio/alarms/Plutonium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Scandium.ogg:system/media/audio/alarms/Scandium.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/ogg/Antimony.ogg:system/media/audio/notifications/Antimony.ogg \ - $(LOCAL_PATH)/notifications/ogg/Argon.ogg:system/media/audio/notifications/Argon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Beryllium.ogg:system/media/audio/notifications/Beryllium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Cobalt.ogg:system/media/audio/notifications/Cobalt.ogg \ - $(LOCAL_PATH)/notifications/ogg/Fluorine.ogg:system/media/audio/notifications/Fluorine.ogg \ - $(LOCAL_PATH)/notifications/ogg/Gallium.ogg:system/media/audio/notifications/Gallium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Helium.ogg:system/media/audio/notifications/Helium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Iridium.ogg:system/media/audio/notifications/Iridium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Krypton.ogg:system/media/audio/notifications/Krypton.ogg \ - $(LOCAL_PATH)/notifications/ogg/Palladium.ogg:system/media/audio/notifications/Palladium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Radon.ogg:system/media/audio/notifications/Radon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Rubidium.ogg:system/media/audio/notifications/Rubidium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Selenium.ogg:system/media/audio/notifications/Selenium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Strontium.ogg:system/media/audio/notifications/Strontium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Thallium.ogg:system/media/audio/notifications/Thallium.ogg \ - $(LOCAL_PATH)/notifications/ogg/Xenon.ogg:system/media/audio/notifications/Xenon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Zirconium.ogg:system/media/audio/notifications/Zirconium.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/alarms/ogg/Barium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Barium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Cesium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Plutonium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Scandium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Scandium.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/ogg/Antimony.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Antimony.ogg \ + $(LOCAL_PATH)/notifications/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Argon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Beryllium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beryllium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Cobalt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Cobalt.ogg \ + $(LOCAL_PATH)/notifications/ogg/Fluorine.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Fluorine.ogg \ + $(LOCAL_PATH)/notifications/ogg/Gallium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Gallium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Helium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Iridium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Iridium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Krypton.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Krypton.ogg \ + $(LOCAL_PATH)/notifications/ogg/Palladium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Palladium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Radon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Radon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Rubidium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Rubidium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Selenium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Selenium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Strontium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Strontium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Thallium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Thallium.ogg \ + $(LOCAL_PATH)/notifications/ogg/Xenon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Xenon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Zirconium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Zirconium.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ diff --git a/data/sounds/AudioPackage7.mk b/data/sounds/AudioPackage7.mk index e4763be2d4aa..27e349d2262e 100644 --- a/data/sounds/AudioPackage7.mk +++ b/data/sounds/AudioPackage7.mk @@ -8,64 +8,64 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:system/media/audio/alarms/Cesium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Fermium.ogg:system/media/audio/alarms/Fermium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Hassium.ogg:system/media/audio/alarms/Hassium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Neptunium.ogg:system/media/audio/alarms/Neptunium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Nobelium.ogg:system/media/audio/alarms/Nobelium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:system/media/audio/alarms/Plutonium.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard_120.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete_120.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn_120.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ - $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:system/media/audio/notifications/Bellatrix.ogg \ - $(LOCAL_PATH)/notifications/ogg/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:system/media/audio/notifications/Hojus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:system/media/audio/notifications/Lalande.ogg \ - $(LOCAL_PATH)/notifications/ogg/Mira.ogg:system/media/audio/notifications/Mira.ogg \ - $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:system/media/audio/notifications/Polaris.ogg \ - $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:system/media/audio/notifications/Proxima.ogg \ - $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:system/media/audio/notifications/Shaula.ogg \ - $(LOCAL_PATH)/notifications/ogg/Spica.ogg:system/media/audio/notifications/Spica.ogg \ - $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:system/media/audio/notifications/Tejat.ogg \ - $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:system/media/audio/notifications/Upsilon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Vega.ogg:system/media/audio/notifications/Vega.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:system/media/audio/ringtones/Andromeda.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ - $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:system/media/audio/ringtones/CanisMajor.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:system/media/audio/ringtones/Carina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:system/media/audio/ringtones/Draco.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:system/media/audio/ringtones/Girtab.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:system/media/audio/ringtones/Hydra.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:system/media/audio/ringtones/Machina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:system/media/audio/ringtones/Orion.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:system/media/audio/ringtones/Perseus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:system/media/audio/ringtones/Themos.ogg \ - $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:system/media/audio/ringtones/UrsaMinor.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:system/media/audio/ringtones/Zeta.ogg + $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Cesium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Fermium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Fermium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Hassium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Hassium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Neptunium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neptunium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Nobelium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Nobelium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Plutonium.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \ + $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Arcturus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Bellatrix.ogg \ + $(LOCAL_PATH)/notifications/ogg/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Hojus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Lalande.ogg \ + $(LOCAL_PATH)/notifications/ogg/Mira.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mira.ogg \ + $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Polaris.ogg \ + $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Proxima.ogg \ + $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Shaula.ogg \ + $(LOCAL_PATH)/notifications/ogg/Spica.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Spica.ogg \ + $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tejat.ogg \ + $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Upsilon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Vega.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Andromeda.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \ + $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CanisMajor.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Carina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Centaurus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cygnus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Draco.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Girtab.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Hydra.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Machina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Orion.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pegasus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Perseus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pyxis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rigel.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Scarabaeus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Solarium.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Themos.ogg \ + $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/UrsaMinor.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zeta.ogg diff --git a/data/sounds/AudioPackage7alt.mk b/data/sounds/AudioPackage7alt.mk index 30e617316ef4..a0f4d89ff32c 100644 --- a/data/sounds/AudioPackage7alt.mk +++ b/data/sounds/AudioPackage7alt.mk @@ -8,63 +8,63 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/alarms/ogg-jp/Argon.ogg:system/media/audio/alarms/Argon.ogg \ - $(LOCAL_PATH)/alarms/ogg-jp/Carbon.ogg:system/media/audio/alarms/Carbon.ogg \ - $(LOCAL_PATH)/alarms/ogg-jp/Helium.ogg:system/media/audio/alarms/Helium.ogg \ - $(LOCAL_PATH)/alarms/ogg-jp/Krypton.ogg:system/media/audio/alarms/Krypton.ogg \ - $(LOCAL_PATH)/alarms/ogg-jp/Neon.ogg:system/media/audio/alarms/Neon.ogg \ - $(LOCAL_PATH)/alarms/ogg-jp/Oxygen.ogg:system/media/audio/alarms/Oxygen.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard_120.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete_120.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn_120.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ - $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:system/media/audio/notifications/Bellatrix.ogg \ - $(LOCAL_PATH)/notifications/ogg/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:system/media/audio/notifications/Hojus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:system/media/audio/notifications/Lalande.ogg \ - $(LOCAL_PATH)/notifications/ogg/Mira.ogg:system/media/audio/notifications/Mira.ogg \ - $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:system/media/audio/notifications/Polaris.ogg \ - $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:system/media/audio/notifications/Proxima.ogg \ - $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:system/media/audio/notifications/Shaula.ogg \ - $(LOCAL_PATH)/notifications/ogg/Spica.ogg:system/media/audio/notifications/Spica.ogg \ - $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:system/media/audio/notifications/Tejat.ogg \ - $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:system/media/audio/notifications/Upsilon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Vega.ogg:system/media/audio/notifications/Vega.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:system/media/audio/ringtones/Andromeda.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ - $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:system/media/audio/ringtones/CanisMajor.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:system/media/audio/ringtones/Carina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:system/media/audio/ringtones/Draco.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:system/media/audio/ringtones/Girtab.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:system/media/audio/ringtones/Hydra.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:system/media/audio/ringtones/Machina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:system/media/audio/ringtones/Orion.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:system/media/audio/ringtones/Perseus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:system/media/audio/ringtones/Themos.ogg \ - $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:system/media/audio/ringtones/UrsaMinor.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:system/media/audio/ringtones/Zeta.ogg + $(LOCAL_PATH)/alarms/ogg-jp/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon.ogg \ + $(LOCAL_PATH)/alarms/ogg-jp/Carbon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon.ogg \ + $(LOCAL_PATH)/alarms/ogg-jp/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Helium.ogg \ + $(LOCAL_PATH)/alarms/ogg-jp/Krypton.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton.ogg \ + $(LOCAL_PATH)/alarms/ogg-jp/Neon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon.ogg \ + $(LOCAL_PATH)/alarms/ogg-jp/Oxygen.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn_120.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/ogg/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/ogg/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \ + $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Arcturus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Bellatrix.ogg \ + $(LOCAL_PATH)/notifications/ogg/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Hojus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Lalande.ogg \ + $(LOCAL_PATH)/notifications/ogg/Mira.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mira.ogg \ + $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Polaris.ogg \ + $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Proxima.ogg \ + $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Shaula.ogg \ + $(LOCAL_PATH)/notifications/ogg/Spica.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Spica.ogg \ + $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tejat.ogg \ + $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Upsilon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Vega.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Andromeda.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \ + $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CanisMajor.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Carina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Centaurus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cygnus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Draco.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Girtab.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Hydra.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Machina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Orion.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pegasus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Perseus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pyxis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rigel.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Scarabaeus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Solarium.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Themos.ogg \ + $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/UrsaMinor.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zeta.ogg diff --git a/data/sounds/AudioPackage8.mk b/data/sounds/AudioPackage8.mk index b38e62dec6ad..032b4d26ed6f 100644 --- a/data/sounds/AudioPackage8.mk +++ b/data/sounds/AudioPackage8.mk @@ -8,66 +8,66 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:system/media/audio/alarms/Cesium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Fermium.ogg:system/media/audio/alarms/Fermium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Hassium.ogg:system/media/audio/alarms/Hassium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Neptunium.ogg:system/media/audio/alarms/Neptunium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Nobelium.ogg:system/media/audio/alarms/Nobelium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:system/media/audio/alarms/Osmium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:system/media/audio/alarms/Plutonium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Promethium.ogg:system/media/audio/alarms/Promethium.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ - $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:system/media/audio/notifications/Bellatrix.ogg \ - $(LOCAL_PATH)/notifications/ogg/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:system/media/audio/notifications/Hojus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:system/media/audio/notifications/Lalande.ogg \ - $(LOCAL_PATH)/notifications/ogg/Mira.ogg:system/media/audio/notifications/Mira.ogg \ - $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:system/media/audio/notifications/Polaris.ogg \ - $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:system/media/audio/notifications/Proxima.ogg \ - $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:system/media/audio/notifications/Shaula.ogg \ - $(LOCAL_PATH)/notifications/ogg/Spica.ogg:system/media/audio/notifications/Spica.ogg \ - $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:system/media/audio/notifications/Tejat.ogg \ - $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:system/media/audio/notifications/Upsilon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Vega.ogg:system/media/audio/notifications/Vega.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:system/media/audio/ringtones/Andromeda.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ - $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:system/media/audio/ringtones/CanisMajor.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:system/media/audio/ringtones/Carina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:system/media/audio/ringtones/Draco.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:system/media/audio/ringtones/Girtab.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:system/media/audio/ringtones/Hydra.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:system/media/audio/ringtones/Machina.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:system/media/audio/ringtones/Orion.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:system/media/audio/ringtones/Perseus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:system/media/audio/ringtones/Themos.ogg \ - $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:system/media/audio/ringtones/UrsaMinor.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:system/media/audio/ringtones/Zeta.ogg + $(LOCAL_PATH)/alarms/ogg/Cesium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Cesium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Fermium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Fermium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Hassium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Hassium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Neptunium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neptunium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Nobelium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Nobelium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Plutonium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Promethium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Promethium.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \ + $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Arcturus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Bellatrix.ogg \ + $(LOCAL_PATH)/notifications/ogg/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Hojus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Lalande.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Lalande.ogg \ + $(LOCAL_PATH)/notifications/ogg/Mira.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mira.ogg \ + $(LOCAL_PATH)/notifications/ogg/Polaris.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Polaris.ogg \ + $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Proxima.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Proxima.ogg \ + $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Shaula.ogg \ + $(LOCAL_PATH)/notifications/ogg/Spica.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Spica.ogg \ + $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tejat.ogg \ + $(LOCAL_PATH)/notifications/ogg/Upsilon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Upsilon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Vega.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Andromeda.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \ + $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CanisMajor.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Carina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Carina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Centaurus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cygnus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Draco.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Draco.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Girtab.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Hydra.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Machina.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Machina.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Orion.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Orion.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pegasus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Perseus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Pyxis.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Rigel.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Scarabaeus.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Sceptrum.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Solarium.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Themos.ogg \ + $(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/UrsaMinor.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zeta.ogg diff --git a/data/sounds/AudioPackage9.mk b/data/sounds/AudioPackage9.mk index dbe1350f304a..53cc8c08a76c 100644 --- a/data/sounds/AudioPackage9.mk +++ b/data/sounds/AudioPackage9.mk @@ -8,43 +8,43 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/alarms/ogg/Argon.ogg:system/media/audio/alarms/Argon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:system/media/audio/alarms/Carbon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Helium.ogg:system/media/audio/alarms/Helium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:system/media/audio/alarms/Krypton.ogg \ - $(LOCAL_PATH)/alarms/ogg/Neon.ogg:system/media/audio/alarms/Neon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:system/media/audio/alarms/Oxygen.ogg \ - $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:system/media/audio/alarms/Osmium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:system/media/audio/alarms/Platinum.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ - $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \ - $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \ - $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ - $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ - $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \ - $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ - $(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \ - $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:system/media/audio/notifications/Hojus.ogg \ - $(LOCAL_PATH)/notifications/ogg/Mira.ogg:system/media/audio/notifications/Mira.ogg \ - $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:system/media/audio/notifications/Shaula.ogg \ - $(LOCAL_PATH)/notifications/ogg/Spica.ogg:system/media/audio/notifications/Spica.ogg \ - $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:system/media/audio/notifications/Syrma.ogg \ - $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:system/media/audio/notifications/Talitha.ogg \ - $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:system/media/audio/notifications/Tejat.ogg \ - $(LOCAL_PATH)/notifications/ogg/Vega.ogg:system/media/audio/notifications/Vega.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:system/media/audio/ringtones/Girtab.ogg + $(LOCAL_PATH)/alarms/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Carbon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Helium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Krypton.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton.ogg \ + $(LOCAL_PATH)/alarms/ogg/Neon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen.ogg \ + $(LOCAL_PATH)/alarms/ogg/Osmium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \ + $(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \ + $(LOCAL_PATH)/effects/ogg/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \ + $(LOCAL_PATH)/effects/ogg/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/Trusted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \ + $(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \ + $(LOCAL_PATH)/notifications/ogg/Alya.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Alya.ogg \ + $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Arcturus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Capella.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Capella.ogg \ + $(LOCAL_PATH)/notifications/ogg/CetiAlpha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CetiAlpha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Hojus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Hojus.ogg \ + $(LOCAL_PATH)/notifications/ogg/Mira.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mira.ogg \ + $(LOCAL_PATH)/notifications/ogg/Pollux.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pollux.ogg \ + $(LOCAL_PATH)/notifications/ogg/Procyon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Procyon.ogg \ + $(LOCAL_PATH)/notifications/ogg/Shaula.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Shaula.ogg \ + $(LOCAL_PATH)/notifications/ogg/Spica.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Spica.ogg \ + $(LOCAL_PATH)/notifications/ogg/Syrma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Syrma.ogg \ + $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Talitha.ogg \ + $(LOCAL_PATH)/notifications/ogg/Tejat.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tejat.ogg \ + $(LOCAL_PATH)/notifications/ogg/Vega.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Vega.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Girtab.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Girtab.ogg diff --git a/data/sounds/AudioPackageGo.mk b/data/sounds/AudioPackageGo.mk index 0296219fe9b4..e3b27f2cd962 100644 --- a/data/sounds/AudioPackageGo.mk +++ b/data/sounds/AudioPackageGo.mk @@ -20,30 +20,30 @@ LOCAL_PATH := frameworks/base/data/sounds # Ring_Synth_04 : Flutey Phone # Alarm_Beep_03 : Beep Beep Beep PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \ - $(LOCAL_PATH)/notifications/ogg/Argon.ogg:system/media/audio/notifications/Argon.ogg \ - $(LOCAL_PATH)/notifications/Canopus.ogg:system/media/audio/notifications/Canopus.ogg \ - $(LOCAL_PATH)/notifications/Deneb.ogg:system/media/audio/notifications/Deneb.ogg \ - $(LOCAL_PATH)/newwavelabs/Highwire.ogg:system/media/audio/notifications/Highwire.ogg \ - $(LOCAL_PATH)/notifications/ogg/Iridium.ogg:system/media/audio/notifications/Iridium.ogg \ - $(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \ - $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:system/media/audio/notifications/Talitha.ogg \ - $(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \ - $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:system/media/audio/ringtones/Kuma.ogg \ - $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:system/media/audio/ringtones/Themos.ogg \ - $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ - $(LOCAL_PATH)/alarms/ogg/Argon.ogg:system/media/audio/alarms/Argon.ogg \ - $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:system/media/audio/alarms/Platinum.ogg \ - $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ - $(LOCAL_PATH)/alarms/ogg/Helium.ogg:system/media/audio/alarms/Helium.ogg \ - $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:system/media/audio/alarms/Oxygen.ogg \ - $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/notifications/ogg/Alya.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Alya.ogg \ + $(LOCAL_PATH)/notifications/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Argon.ogg \ + $(LOCAL_PATH)/notifications/Canopus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Canopus.ogg \ + $(LOCAL_PATH)/notifications/Deneb.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Deneb.ogg \ + $(LOCAL_PATH)/newwavelabs/Highwire.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Highwire.ogg \ + $(LOCAL_PATH)/notifications/ogg/Iridium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Iridium.ogg \ + $(LOCAL_PATH)/notifications/pixiedust.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/pixiedust.ogg \ + $(LOCAL_PATH)/notifications/ogg/Talitha.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Talitha.ogg \ + $(LOCAL_PATH)/Ring_Classic_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Classic_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_02.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Cygnus.ogg \ + $(LOCAL_PATH)/Ring_Digital_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Digital_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_04.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_04.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Kuma.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Kuma.ogg \ + $(LOCAL_PATH)/ringtones/ogg/Themos.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Themos.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Classic.ogg \ + $(LOCAL_PATH)/alarms/ogg/Argon.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon.ogg \ + $(LOCAL_PATH)/alarms/ogg/Platinum.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum.ogg \ + $(LOCAL_PATH)/Alarm_Beep_03.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_03.ogg \ + $(LOCAL_PATH)/alarms/ogg/Helium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Helium.ogg \ + $(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen.ogg \ + $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ diff --git a/data/sounds/AudioTv.mk b/data/sounds/AudioTv.mk index 91265af77fa5..d0006b787f49 100644 --- a/data/sounds/AudioTv.mk +++ b/data/sounds/AudioTv.mk @@ -15,8 +15,8 @@ LOCAL_PATH := frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/effects/ogg/KeypressDelete_120_48k.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressReturn_120_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120_48k.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/ogg/KeypressStandard_120_48k.ogg:system/media/audio/ui/KeypressStandard.ogg + $(LOCAL_PATH)/effects/ogg/KeypressDelete_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressReturn_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/ogg/KeypressStandard_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg diff --git a/data/sounds/OriginalAudio.mk b/data/sounds/OriginalAudio.mk index f68375205d89..4d74d1224caa 100644 --- a/data/sounds/OriginalAudio.mk +++ b/data/sounds/OriginalAudio.mk @@ -9,67 +9,67 @@ LOCAL_PATH:= frameworks/base/data/sounds PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/F1_MissedCall.ogg:system/media/audio/notifications/F1_MissedCall.ogg \ - $(LOCAL_PATH)/F1_New_MMS.ogg:system/media/audio/notifications/F1_New_MMS.ogg \ - $(LOCAL_PATH)/F1_New_SMS.ogg:system/media/audio/notifications/F1_New_SMS.ogg \ - $(LOCAL_PATH)/Alarm_Buzzer.ogg:system/media/audio/alarms/Alarm_Buzzer.ogg \ - $(LOCAL_PATH)/Alarm_Beep_01.ogg:system/media/audio/alarms/Alarm_Beep_01.ogg \ - $(LOCAL_PATH)/Alarm_Beep_02.ogg:system/media/audio/alarms/Alarm_Beep_02.ogg \ - $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ - $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ - $(LOCAL_PATH)/Alarm_Rooster_02.ogg:system/media/audio/alarms/Alarm_Rooster_02.ogg \ - $(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \ - $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ - $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ - $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \ - $(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.ogg \ - $(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \ - $(LOCAL_PATH)/notifications/Tinkerbell.ogg:system/media/audio/notifications/Tinkerbell.ogg \ - $(LOCAL_PATH)/effects/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ - $(LOCAL_PATH)/effects/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ - $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ - $(LOCAL_PATH)/effects/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ - $(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ - $(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ - $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \ - $(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ - $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \ - $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg + $(LOCAL_PATH)/F1_MissedCall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_MissedCall.ogg \ + $(LOCAL_PATH)/F1_New_MMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_MMS.ogg \ + $(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \ + $(LOCAL_PATH)/Alarm_Buzzer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Buzzer.ogg \ + $(LOCAL_PATH)/Alarm_Beep_01.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_01.ogg \ + $(LOCAL_PATH)/Alarm_Beep_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_02.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Classic.ogg \ + $(LOCAL_PATH)/Alarm_Beep_03.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Beep_03.ogg \ + $(LOCAL_PATH)/Alarm_Rooster_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Alarm_Rooster_02.ogg \ + $(LOCAL_PATH)/Ring_Classic_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Classic_02.ogg \ + $(LOCAL_PATH)/Ring_Digital_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Digital_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_04.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_04.ogg \ + $(LOCAL_PATH)/Ring_Synth_02.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Ring_Synth_02.ogg \ + $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beat_Box_Android.ogg \ + $(LOCAL_PATH)/notifications/Heaven.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Heaven.ogg \ + $(LOCAL_PATH)/notifications/TaDa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/TaDa.ogg \ + $(LOCAL_PATH)/notifications/Tinkerbell.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Tinkerbell.ogg \ + $(LOCAL_PATH)/effects/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/KeypressStandard.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/KeypressDelete.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/KeypressReturn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/VideoRecord.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/VideoStop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/VideoStop.ogg \ + $(LOCAL_PATH)/effects/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BeatPlucker.ogg \ + $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CaffeineSnake.ogg ifneq ($(MINIMAL_NEWWAVELABS),true) PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:system/media/audio/ringtones/BentleyDubs.ogg \ - $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ - $(LOCAL_PATH)/newwavelabs/CaribbeanIce.ogg:system/media/audio/ringtones/CaribbeanIce.ogg \ - $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:system/media/audio/ringtones/CurveBall.ogg \ - $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:system/media/audio/ringtones/EtherShake.ogg \ - $(LOCAL_PATH)/newwavelabs/FriendlyGhost.ogg:system/media/audio/ringtones/FriendlyGhost.ogg \ - $(LOCAL_PATH)/newwavelabs/GameOverGuitar.ogg:system/media/audio/ringtones/GameOverGuitar.ogg \ - $(LOCAL_PATH)/newwavelabs/Growl.ogg:system/media/audio/ringtones/Growl.ogg \ - $(LOCAL_PATH)/newwavelabs/InsertCoin.ogg:system/media/audio/ringtones/InsertCoin.ogg \ - $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:system/media/audio/ringtones/LoopyLounge.ogg \ - $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:system/media/audio/ringtones/LoveFlute.ogg \ - $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:system/media/audio/ringtones/MidEvilJaunt.ogg \ - $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:system/media/audio/ringtones/MildlyAlarming.ogg \ - $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:system/media/audio/ringtones/NewPlayer.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises1.ogg:system/media/audio/ringtones/Noises1.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises2.ogg:system/media/audio/ringtones/Noises2.ogg \ - $(LOCAL_PATH)/newwavelabs/Noises3.ogg:system/media/audio/ringtones/Noises3.ogg \ - $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:system/media/audio/ringtones/OrganDub.ogg \ - $(LOCAL_PATH)/newwavelabs/RomancingTheTone.ogg:system/media/audio/ringtones/RomancingTheTone.ogg \ - $(LOCAL_PATH)/newwavelabs/SitarVsSitar.ogg:system/media/audio/ringtones/SitarVsSitar.ogg \ - $(LOCAL_PATH)/newwavelabs/SpringyJalopy.ogg:system/media/audio/ringtones/SpringyJalopy.ogg \ - $(LOCAL_PATH)/newwavelabs/Terminated.ogg:system/media/audio/ringtones/Terminated.ogg \ - $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:system/media/audio/ringtones/TwirlAway.ogg \ - $(LOCAL_PATH)/newwavelabs/VeryAlarmed.ogg:system/media/audio/ringtones/VeryAlarmed.ogg \ - $(LOCAL_PATH)/newwavelabs/World.ogg:system/media/audio/ringtones/World.ogg \ - $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:system/media/audio/notifications/DearDeer.ogg \ - $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:system/media/audio/notifications/DontPanic.ogg \ - $(LOCAL_PATH)/newwavelabs/Highwire.ogg:system/media/audio/notifications/Highwire.ogg \ - $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:system/media/audio/notifications/KzurbSonar.ogg \ - $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:system/media/audio/notifications/OnTheHunt.ogg \ - $(LOCAL_PATH)/newwavelabs/Voila.ogg:system/media/audio/notifications/Voila.ogg \ - $(LOCAL_PATH)/newwavelabs/CrazyDream.ogg:system/media/audio/ringtones/CrazyDream.ogg \ - $(LOCAL_PATH)/newwavelabs/DreamTheme.ogg:system/media/audio/ringtones/DreamTheme.ogg + $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BentleyDubs.ogg \ + $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/BirdLoop.ogg \ + $(LOCAL_PATH)/newwavelabs/CaribbeanIce.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CaribbeanIce.ogg \ + $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CurveBall.ogg \ + $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/EtherShake.ogg \ + $(LOCAL_PATH)/newwavelabs/FriendlyGhost.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/FriendlyGhost.ogg \ + $(LOCAL_PATH)/newwavelabs/GameOverGuitar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/GameOverGuitar.ogg \ + $(LOCAL_PATH)/newwavelabs/Growl.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Growl.ogg \ + $(LOCAL_PATH)/newwavelabs/InsertCoin.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/InsertCoin.ogg \ + $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoopyLounge.ogg \ + $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/LoveFlute.ogg \ + $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MidEvilJaunt.ogg \ + $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/MildlyAlarming.ogg \ + $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/NewPlayer.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises1.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises1.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises2.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises2.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises3.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Noises3.ogg \ + $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/OrganDub.ogg \ + $(LOCAL_PATH)/newwavelabs/RomancingTheTone.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/RomancingTheTone.ogg \ + $(LOCAL_PATH)/newwavelabs/SitarVsSitar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SitarVsSitar.ogg \ + $(LOCAL_PATH)/newwavelabs/SpringyJalopy.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/SpringyJalopy.ogg \ + $(LOCAL_PATH)/newwavelabs/Terminated.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Terminated.ogg \ + $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/TwirlAway.ogg \ + $(LOCAL_PATH)/newwavelabs/VeryAlarmed.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/VeryAlarmed.ogg \ + $(LOCAL_PATH)/newwavelabs/World.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/World.ogg \ + $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DearDeer.ogg \ + $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/DontPanic.ogg \ + $(LOCAL_PATH)/newwavelabs/Highwire.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Highwire.ogg \ + $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/KzurbSonar.ogg \ + $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/OnTheHunt.ogg \ + $(LOCAL_PATH)/newwavelabs/Voila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Voila.ogg \ + $(LOCAL_PATH)/newwavelabs/CrazyDream.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/CrazyDream.ogg \ + $(LOCAL_PATH)/newwavelabs/DreamTheme.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/DreamTheme.ogg endif diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 7e69e3a8a73f..96798f978465 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -61,6 +61,7 @@ cc_defaults { "libstatslog", "libutils", "libEGL", + "libGLESv1_CM", "libGLESv2", "libGLESv3", "libvulkan", diff --git a/libs/hwui/WebViewFunctorManager.cpp b/libs/hwui/WebViewFunctorManager.cpp index 20e77b453706..5b7ae70e821c 100644 --- a/libs/hwui/WebViewFunctorManager.cpp +++ b/libs/hwui/WebViewFunctorManager.cpp @@ -37,7 +37,8 @@ RenderMode WebViewFunctor_queryPlatformRenderMode() { } } -int WebViewFunctor_create(const WebViewFunctorCallbacks& prototype, RenderMode functorMode) { +int WebViewFunctor_create(void* data, const WebViewFunctorCallbacks& prototype, + RenderMode functorMode) { if (functorMode != RenderMode::OpenGL_ES && functorMode != RenderMode::Vulkan) { ALOGW("Unknown rendermode %d", (int)functorMode); return -1; @@ -47,7 +48,7 @@ int WebViewFunctor_create(const WebViewFunctorCallbacks& prototype, RenderMode f ALOGW("Unable to map from GLES platform to a vulkan functor"); return -1; } - return WebViewFunctorManager::instance().createFunctor(prototype, functorMode); + return WebViewFunctorManager::instance().createFunctor(data, prototype, functorMode); } void WebViewFunctor_release(int functor) { @@ -56,7 +57,9 @@ void WebViewFunctor_release(int functor) { static std::atomic_int sNextId{1}; -WebViewFunctor::WebViewFunctor(const WebViewFunctorCallbacks& callbacks, RenderMode functorMode) { +WebViewFunctor::WebViewFunctor(void* data, const WebViewFunctorCallbacks& callbacks, + RenderMode functorMode) + : mData(data) { mFunctor = sNextId++; mCallbacks = callbacks; mMode = functorMode; @@ -66,12 +69,12 @@ WebViewFunctor::~WebViewFunctor() { destroyContext(); ATRACE_NAME("WebViewFunctor::onDestroy"); - mCallbacks.onDestroyed(mFunctor); + mCallbacks.onDestroyed(mFunctor, mData); } void WebViewFunctor::sync(const WebViewSyncData& syncData) const { ATRACE_NAME("WebViewFunctor::sync"); - mCallbacks.onSync(mFunctor, syncData); + mCallbacks.onSync(mFunctor, mData, syncData); } void WebViewFunctor::drawGl(const DrawGlInfo& drawInfo) { @@ -79,14 +82,14 @@ void WebViewFunctor::drawGl(const DrawGlInfo& drawInfo) { if (!mHasContext) { mHasContext = true; } - mCallbacks.gles.draw(mFunctor, drawInfo); + mCallbacks.gles.draw(mFunctor, mData, drawInfo); } void WebViewFunctor::destroyContext() { if (mHasContext) { mHasContext = false; ATRACE_NAME("WebViewFunctor::onContextDestroyed"); - mCallbacks.onContextDestroyed(mFunctor); + mCallbacks.onContextDestroyed(mFunctor, mData); } } @@ -95,9 +98,9 @@ WebViewFunctorManager& WebViewFunctorManager::instance() { return sInstance; } -int WebViewFunctorManager::createFunctor(const WebViewFunctorCallbacks& callbacks, +int WebViewFunctorManager::createFunctor(void* data, const WebViewFunctorCallbacks& callbacks, RenderMode functorMode) { - auto object = std::make_unique<WebViewFunctor>(callbacks, functorMode); + auto object = std::make_unique<WebViewFunctor>(data, callbacks, functorMode); int id = object->id(); auto handle = object->createHandle(); { @@ -164,4 +167,4 @@ sp<WebViewFunctor::Handle> WebViewFunctorManager::handleFor(int functor) { return nullptr; } -} // namespace android::uirenderer
\ No newline at end of file +} // namespace android::uirenderer diff --git a/libs/hwui/WebViewFunctorManager.h b/libs/hwui/WebViewFunctorManager.h index 2a621dd411e3..1719ce7cca75 100644 --- a/libs/hwui/WebViewFunctorManager.h +++ b/libs/hwui/WebViewFunctorManager.h @@ -29,7 +29,7 @@ class WebViewFunctorManager; class WebViewFunctor { public: - WebViewFunctor(const WebViewFunctorCallbacks& callbacks, RenderMode functorMode); + WebViewFunctor(void* data, const WebViewFunctorCallbacks& callbacks, RenderMode functorMode); ~WebViewFunctor(); class Handle : public LightRefBase<Handle> { @@ -63,6 +63,7 @@ public: private: WebViewFunctorCallbacks mCallbacks; + void* const mData; int mFunctor; RenderMode mMode; bool mHasContext = false; @@ -73,7 +74,7 @@ class WebViewFunctorManager { public: static WebViewFunctorManager& instance(); - int createFunctor(const WebViewFunctorCallbacks& callbacks, RenderMode functorMode); + int createFunctor(void* data, const WebViewFunctorCallbacks& callbacks, RenderMode functorMode); void releaseFunctor(int functor); void onContextDestroyed(); void destroyFunctor(int functor); diff --git a/libs/hwui/private/hwui/WebViewFunctor.h b/libs/hwui/private/hwui/WebViewFunctor.h index e5346aabaee3..da3d06a4d60c 100644 --- a/libs/hwui/private/hwui/WebViewFunctor.h +++ b/libs/hwui/private/hwui/WebViewFunctor.h @@ -17,6 +17,7 @@ #ifndef FRAMEWORKS_BASE_WEBVIEWFUNCTOR_H #define FRAMEWORKS_BASE_WEBVIEWFUNCTOR_H +#include <cutils/compiler.h> #include <private/hwui/DrawGlInfo.h> namespace android::uirenderer { @@ -27,7 +28,7 @@ enum class RenderMode { }; // Static for the lifetime of the process -RenderMode WebViewFunctor_queryPlatformRenderMode(); +ANDROID_API RenderMode WebViewFunctor_queryPlatformRenderMode(); struct WebViewSyncData { bool applyForceDark; @@ -35,21 +36,21 @@ struct WebViewSyncData { struct WebViewFunctorCallbacks { // kModeSync, called on RenderThread - void (*onSync)(int functor, const WebViewSyncData& syncData); + void (*onSync)(int functor, void* data, const WebViewSyncData& syncData); // Called when either the context is destroyed _or_ when the functor's last reference goes // away. Will always be called with an active context and always on renderthread. - void (*onContextDestroyed)(int functor); + void (*onContextDestroyed)(int functor, void* data); // Called when the last reference to the handle goes away and the handle is considered // irrevocably destroyed. Will always be proceeded by a call to onContextDestroyed if // this functor had ever been drawn. - void (*onDestroyed)(int functor); + void (*onDestroyed)(int functor, void* data); union { struct { // Called on RenderThread. initialize is guaranteed to happen before this call - void (*draw)(int functor, const DrawGlInfo& params); + void (*draw)(int functor, void* data, const DrawGlInfo& params); } gles; // TODO: VK support. The current DrawVkInfo is monolithic and needs to be split up for // what params are valid on what callbacks @@ -70,12 +71,12 @@ struct WebViewFunctorCallbacks { // Creates a new WebViewFunctor from the given prototype. The prototype is copied after // this function returns. Caller retains full ownership of it. // Returns -1 if the creation fails (such as an unsupported functorMode + platform mode combination) -int WebViewFunctor_create(const WebViewFunctorCallbacks& prototype, RenderMode functorMode); +ANDROID_API int WebViewFunctor_create(void* data, const WebViewFunctorCallbacks& prototype, RenderMode functorMode); // May be called on any thread to signal that the functor should be destroyed. // The functor will receive an onDestroyed when the last usage of it is released, // and it should be considered alive & active until that point. -void WebViewFunctor_release(int functor); +ANDROID_API void WebViewFunctor_release(int functor); } // namespace android::uirenderer diff --git a/libs/hwui/tests/common/TestUtils.h b/libs/hwui/tests/common/TestUtils.h index 5ff8993e6779..6a1ca5a25361 100644 --- a/libs/hwui/tests/common/TestUtils.h +++ b/libs/hwui/tests/common/TestUtils.h @@ -315,24 +315,24 @@ public: static WebViewFunctorCallbacks createMockFunctor(RenderMode mode) { auto callbacks = WebViewFunctorCallbacks{ .onSync = - [](int functor, const WebViewSyncData& data) { + [](int functor, void* client_data, const WebViewSyncData& data) { expectOnRenderThread(); sMockFunctorCounts[functor].sync++; }, .onContextDestroyed = - [](int functor) { + [](int functor, void* client_data) { expectOnRenderThread(); sMockFunctorCounts[functor].contextDestroyed++; }, .onDestroyed = - [](int functor) { + [](int functor, void* client_data) { expectOnRenderThread(); sMockFunctorCounts[functor].destroyed++; }, }; switch (mode) { case RenderMode::OpenGL_ES: - callbacks.gles.draw = [](int functor, const DrawGlInfo& params) { + callbacks.gles.draw = [](int functor, void* client_data, const DrawGlInfo& params) { expectOnRenderThread(); sMockFunctorCounts[functor].glesDraw++; }; diff --git a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp index 53bf84f13fd6..1b4cf7e144bd 100644 --- a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp +++ b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp @@ -100,8 +100,8 @@ TEST(SkiaDisplayList, syncContexts) { GLFunctorDrawable functorDrawable(&functor, nullptr, &dummyCanvas); skiaDL.mChildFunctors.push_back(&functorDrawable); - int functor2 = WebViewFunctor_create(TestUtils::createMockFunctor(RenderMode::OpenGL_ES), - RenderMode::OpenGL_ES); + int functor2 = WebViewFunctor_create( + nullptr, TestUtils::createMockFunctor(RenderMode::OpenGL_ES), RenderMode::OpenGL_ES); auto& counts = TestUtils::countsForFunctor(functor2); skiaDL.mChildFunctors.push_back( skiaDL.allocateDrawable<GLFunctorDrawable>(functor2, &dummyCanvas)); diff --git a/libs/hwui/tests/unit/WebViewFunctorManagerTests.cpp b/libs/hwui/tests/unit/WebViewFunctorManagerTests.cpp index c8169aff1c5e..e1fb8b7069ff 100644 --- a/libs/hwui/tests/unit/WebViewFunctorManagerTests.cpp +++ b/libs/hwui/tests/unit/WebViewFunctorManagerTests.cpp @@ -27,8 +27,8 @@ using namespace android; using namespace android::uirenderer; TEST(WebViewFunctor, createDestroyGLES) { - int functor = WebViewFunctor_create(TestUtils::createMockFunctor(RenderMode::OpenGL_ES), - RenderMode::OpenGL_ES); + int functor = WebViewFunctor_create( + nullptr, TestUtils::createMockFunctor(RenderMode::OpenGL_ES), RenderMode::OpenGL_ES); ASSERT_NE(-1, functor); WebViewFunctor_release(functor); TestUtils::runOnRenderThreadUnmanaged([](renderthread::RenderThread&) { @@ -41,8 +41,8 @@ TEST(WebViewFunctor, createDestroyGLES) { } TEST(WebViewFunctor, createSyncHandleGLES) { - int functor = WebViewFunctor_create(TestUtils::createMockFunctor(RenderMode::OpenGL_ES), - RenderMode::OpenGL_ES); + int functor = WebViewFunctor_create( + nullptr, TestUtils::createMockFunctor(RenderMode::OpenGL_ES), RenderMode::OpenGL_ES); ASSERT_NE(-1, functor); auto handle = WebViewFunctorManager::instance().handleFor(functor); ASSERT_TRUE(handle); @@ -82,8 +82,8 @@ TEST(WebViewFunctor, createSyncHandleGLES) { } TEST(WebViewFunctor, createSyncDrawGLES) { - int functor = WebViewFunctor_create(TestUtils::createMockFunctor(RenderMode::OpenGL_ES), - RenderMode::OpenGL_ES); + int functor = WebViewFunctor_create( + nullptr, TestUtils::createMockFunctor(RenderMode::OpenGL_ES), RenderMode::OpenGL_ES); ASSERT_NE(-1, functor); auto handle = WebViewFunctorManager::instance().handleFor(functor); ASSERT_TRUE(handle); @@ -109,8 +109,8 @@ TEST(WebViewFunctor, createSyncDrawGLES) { } TEST(WebViewFunctor, contextDestroyed) { - int functor = WebViewFunctor_create(TestUtils::createMockFunctor(RenderMode::OpenGL_ES), - RenderMode::OpenGL_ES); + int functor = WebViewFunctor_create( + nullptr, TestUtils::createMockFunctor(RenderMode::OpenGL_ES), RenderMode::OpenGL_ES); ASSERT_NE(-1, functor); auto handle = WebViewFunctorManager::instance().handleFor(functor); ASSERT_TRUE(handle); @@ -151,4 +151,4 @@ TEST(WebViewFunctor, contextDestroyed) { EXPECT_EQ(2, counts.glesDraw); EXPECT_EQ(2, counts.contextDestroyed); EXPECT_EQ(1, counts.destroyed); -}
\ No newline at end of file +} diff --git a/media/java/android/media/MediaController2.java b/media/java/android/media/MediaController2.java index 7665c92f9264..b8381a7249be 100644 --- a/media/java/android/media/MediaController2.java +++ b/media/java/android/media/MediaController2.java @@ -109,7 +109,7 @@ public class MediaController2 implements AutoCloseable { mContext = context; mSessionToken = token; mCallbackExecutor = (executor == null) ? context.getMainExecutor() : executor; - mCallback = (callback == null) ? new ControllerCallback() { } : callback; + mCallback = (callback == null) ? new ControllerCallback() {} : callback; mControllerStub = new Controller2Link(this); // NOTE: mResultHandler uses main looper, so this MUST NOT be blocked. mResultHandler = new Handler(context.getMainLooper()); @@ -132,7 +132,7 @@ public class MediaController2 implements AutoCloseable { try { mSessionBinder.unlinkToDeath(mDeathRecipient, 0); mSessionBinder.disconnect(mControllerStub, getNextSeqNumber()); - } catch (RuntimeException e) { + } catch (RuntimeException e) { // No-op } } @@ -326,7 +326,7 @@ public class MediaController2 implements AutoCloseable { * @param allowedCommands commands that's allowed by the session. */ public void onConnected(@NonNull MediaController2 controller, - @NonNull Session2CommandGroup allowedCommands) { } + @NonNull Session2CommandGroup allowedCommands) {} /** * Called when the session refuses the controller or the controller is disconnected from @@ -338,7 +338,7 @@ public class MediaController2 implements AutoCloseable { * * @param controller the controller for this event */ - public void onDisconnected(@NonNull MediaController2 controller) { } + public void onDisconnected(@NonNull MediaController2 controller) {} /** * Called when the connected session sent a session command. @@ -364,6 +364,6 @@ public class MediaController2 implements AutoCloseable { * @param result the result of the session command */ public void onCommandResult(@NonNull MediaController2 controller, @NonNull Object token, - @NonNull Session2Command command, @NonNull Session2Command.Result result) { } + @NonNull Session2Command command, @NonNull Session2Command.Result result) {} } } diff --git a/media/java/android/media/MediaItem2.java b/media/java/android/media/MediaItem2.java index 235325ebaf06..c496cf75995e 100644 --- a/media/java/android/media/MediaItem2.java +++ b/media/java/android/media/MediaItem2.java @@ -40,9 +40,8 @@ import java.util.concurrent.Executor; * <a href="{@docRoot}reference/androidx/media2/package-summary.html">Media2 Library</a> * for consistent behavior across all devices. * <p> - * @hide */ -public class MediaItem2 implements Parcelable { +public final class MediaItem2 implements Parcelable { private static final String TAG = "MediaItem2"; // intentionally less than long.MAX_VALUE. @@ -69,7 +68,6 @@ public class MediaItem2 implements Parcelable { } }; - // TODO: Use SessionPlayer2.UNKNOWN_TIME instead private static final long UNKNOWN_TIME = -1; private final long mStartPositionMs; diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 0057875ec3f4..fb18c3b67480 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -25,8 +25,10 @@ import android.content.ContentProvider; import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; +import android.graphics.SurfaceTexture; +import android.media.SubtitleController.Anchor; +import android.media.SubtitleTrack.RenderingWidget; import android.net.Uri; -import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -35,30 +37,19 @@ import android.os.Message; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; -import android.os.Process; import android.os.PowerManager; +import android.os.Process; import android.os.SystemProperties; import android.provider.Settings; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; +import android.util.ArrayMap; import android.util.Log; import android.util.Pair; -import android.util.ArrayMap; import android.view.Surface; import android.view.SurfaceHolder; import android.widget.VideoView; -import android.graphics.SurfaceTexture; -import android.media.AudioManager; -import android.media.MediaDrm; -import android.media.MediaFormat; -import android.media.MediaTimeProvider; -import android.media.PlaybackParams; -import android.media.SubtitleController; -import android.media.SubtitleController.Anchor; -import android.media.SubtitleData; -import android.media.SubtitleTrack.RenderingWidget; -import android.media.SyncParams; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; @@ -72,7 +63,6 @@ import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.lang.Runnable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.ref.WeakReference; @@ -2105,9 +2095,11 @@ public class MediaPlayer extends PlayerBase mOnInfoListener = null; mOnVideoSizeChangedListener = null; mOnTimedTextListener = null; - if (mTimeProvider != null) { - mTimeProvider.close(); - mTimeProvider = null; + synchronized (mTimeProviderLock) { + if (mTimeProvider != null) { + mTimeProvider.close(); + mTimeProvider = null; + } } synchronized(this) { mSubtitleDataListenerDisabled = false; @@ -2147,9 +2139,11 @@ public class MediaPlayer extends PlayerBase if (mSubtitleController != null) { mSubtitleController.reset(); } - if (mTimeProvider != null) { - mTimeProvider.close(); - mTimeProvider = null; + synchronized (mTimeProviderLock) { + if (mTimeProvider != null) { + mTimeProvider.close(); + mTimeProvider = null; + } } stayAwake(false); @@ -2790,12 +2784,17 @@ public class MediaPlayer extends PlayerBase synchronized (mIndexTrackPairs) { mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track)); } - Handler h = mTimeProvider.mEventHandler; - int what = TimeProvider.NOTIFY; - int arg1 = TimeProvider.NOTIFY_TRACK_DATA; - Pair<SubtitleTrack, byte[]> trackData = Pair.create(track, contents.getBytes()); - Message m = h.obtainMessage(what, arg1, 0, trackData); - h.sendMessage(m); + synchronized (mTimeProviderLock) { + if (mTimeProvider != null) { + Handler h = mTimeProvider.mEventHandler; + int what = TimeProvider.NOTIFY; + int arg1 = TimeProvider.NOTIFY_TRACK_DATA; + Pair<SubtitleTrack, byte[]> trackData = + Pair.create(track, contents.getBytes()); + Message m = h.obtainMessage(what, arg1, 0, trackData); + h.sendMessage(m); + } + } return MEDIA_INFO_EXTERNAL_METADATA_UPDATE; } @@ -3020,12 +3019,17 @@ public class MediaPlayer extends PlayerBase total += bytes; } } - Handler h = mTimeProvider.mEventHandler; - int what = TimeProvider.NOTIFY; - int arg1 = TimeProvider.NOTIFY_TRACK_DATA; - Pair<SubtitleTrack, byte[]> trackData = Pair.create(track, bos.toByteArray()); - Message m = h.obtainMessage(what, arg1, 0, trackData); - h.sendMessage(m); + synchronized (mTimeProviderLock) { + if (mTimeProvider != null) { + Handler h = mTimeProvider.mEventHandler; + int what = TimeProvider.NOTIFY; + int arg1 = TimeProvider.NOTIFY_TRACK_DATA; + Pair<SubtitleTrack, byte[]> trackData = + Pair.create(track, bos.toByteArray()); + Message m = h.obtainMessage(what, arg1, 0, trackData); + h.sendMessage(m); + } + } return MEDIA_INFO_EXTERNAL_METADATA_UPDATE; } catch (Exception e) { Log.e(TAG, e.getMessage(), e); @@ -3308,14 +3312,17 @@ public class MediaPlayer extends PlayerBase private static final int MEDIA_AUDIO_ROUTING_CHANGED = 10000; private TimeProvider mTimeProvider; + private final Object mTimeProviderLock = new Object(); /** @hide */ @UnsupportedAppUsage public MediaTimeProvider getMediaTimeProvider() { - if (mTimeProvider == null) { - mTimeProvider = new TimeProvider(this); + synchronized (mTimeProviderLock) { + if (mTimeProvider == null) { + mTimeProvider = new TimeProvider(this); + } + return mTimeProvider; } - return mTimeProvider; } private class EventHandler extends Handler diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java index b874ba461c2b..1ee851f5a068 100644 --- a/media/java/android/media/MediaSession2.java +++ b/media/java/android/media/MediaSession2.java @@ -464,7 +464,21 @@ public class MediaSession2 implements AutoCloseable { if (mId == null) { mId = ""; } - return new MediaSession2(mContext, mId, mSessionActivity, mCallbackExecutor, mCallback); + MediaSession2 session2 = new MediaSession2(mContext, mId, mSessionActivity, + mCallbackExecutor, mCallback); + + // Notify framework about the newly create session after the constructor is finished. + // Otherwise, framework may access the session before the initialization is finished. + try { + MediaSessionManager manager = (MediaSessionManager) mContext.getSystemService( + Context.MEDIA_SESSION_SERVICE); + manager.notifySession2Created(session2.getSessionToken()); + } catch (Exception e) { + session2.close(); + throw e; + } + + return session2; } } @@ -643,7 +657,7 @@ public class MediaSession2 implements AutoCloseable { public abstract static class SessionCallback { /** * Called when a controller is created for this session. Return allowed commands for - * controller. By default it allows all connection requests and commands. + * controller. By default it returns {@code null}. * <p> * You can reject the connection by returning {@code null}. In that case, controller * receives {@link MediaController2.ControllerCallback#onDisconnected(MediaController2)} @@ -656,10 +670,7 @@ public class MediaSession2 implements AutoCloseable { @Nullable public Session2CommandGroup onConnect(@NonNull MediaSession2 session, @NonNull ControllerInfo controller) { - Session2CommandGroup commands = new Session2CommandGroup.Builder() - .addAllPredefinedCommands(Session2Command.COMMAND_VERSION_1) - .build(); - return commands; + return null; } /** @@ -669,7 +680,7 @@ public class MediaSession2 implements AutoCloseable { * @param controller controller information */ public void onDisconnected(@NonNull MediaSession2 session, - @NonNull ControllerInfo controller) { } + @NonNull ControllerInfo controller) {} /** * Called when a controller sent a session command. @@ -699,6 +710,6 @@ public class MediaSession2 implements AutoCloseable { */ public void onCommandResult(@NonNull MediaSession2 session, @NonNull ControllerInfo controller, @NonNull Object token, - @NonNull Session2Command command, @NonNull Session2Command.Result result) { } + @NonNull Session2Command command, @NonNull Session2Command.Result result) {} } } diff --git a/media/java/android/media/Session2Command.java b/media/java/android/media/Session2Command.java index e46e64eb1a5c..d2a5aae435a1 100644 --- a/media/java/android/media/Session2Command.java +++ b/media/java/android/media/Session2Command.java @@ -16,18 +16,13 @@ package android.media; -import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; -import android.util.ArrayMap; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.List; import java.util.Objects; /** @@ -46,392 +41,11 @@ import java.util.Objects; */ public final class Session2Command implements Parcelable { /** - * The first version of session commands. This version is for commands introduced in API 29. - * <p> - * This would be used to specify which commands should be added by - * {@link Session2CommandGroup.Builder#addAllPredefinedCommands(int)} - * - * @see Session2CommandGroup.Builder#addAllPredefinedCommands(int) - */ - public static final int COMMAND_VERSION_1 = 1; - - /** - * @hide - */ - public static final int COMMAND_VERSION_CURRENT = COMMAND_VERSION_1; - - /** - * @hide - */ - @IntDef({COMMAND_VERSION_1}) - @Retention(RetentionPolicy.SOURCE) - public @interface CommandVersion {} - - /** - * @hide - */ - @IntDef({COMMAND_CODE_CUSTOM, - COMMAND_CODE_PLAYER_PLAY, - COMMAND_CODE_PLAYER_PAUSE, - COMMAND_CODE_PLAYER_PREPARE, - COMMAND_CODE_PLAYER_SEEK_TO, - COMMAND_CODE_PLAYER_SET_SPEED, - COMMAND_CODE_PLAYER_GET_PLAYLIST, - COMMAND_CODE_PLAYER_SET_PLAYLIST, - COMMAND_CODE_PLAYER_SKIP_TO_PLAYLIST_ITEM, - COMMAND_CODE_PLAYER_SKIP_TO_PREVIOUS_PLAYLIST_ITEM, - COMMAND_CODE_PLAYER_SKIP_TO_NEXT_PLAYLIST_ITEM, - COMMAND_CODE_PLAYER_SET_SHUFFLE_MODE, - COMMAND_CODE_PLAYER_SET_REPEAT_MODE, - COMMAND_CODE_PLAYER_GET_PLAYLIST_METADATA, - COMMAND_CODE_PLAYER_ADD_PLAYLIST_ITEM, - COMMAND_CODE_PLAYER_REMOVE_PLAYLIST_ITEM, - COMMAND_CODE_PLAYER_REPLACE_PLAYLIST_ITEM, - COMMAND_CODE_PLAYER_GET_CURRENT_MEDIA_ITEM, - COMMAND_CODE_PLAYER_UPDATE_LIST_METADATA, - COMMAND_CODE_PLAYER_SET_MEDIA_ITEM, - COMMAND_CODE_VOLUME_SET_VOLUME, - COMMAND_CODE_VOLUME_ADJUST_VOLUME, - COMMAND_CODE_SESSION_FAST_FORWARD, - COMMAND_CODE_SESSION_REWIND, - COMMAND_CODE_SESSION_SKIP_FORWARD, - COMMAND_CODE_SESSION_SKIP_BACKWARD, - COMMAND_CODE_SESSION_SET_RATING, - COMMAND_CODE_LIBRARY_GET_LIBRARY_ROOT, - COMMAND_CODE_LIBRARY_SUBSCRIBE, - COMMAND_CODE_LIBRARY_UNSUBSCRIBE, - COMMAND_CODE_LIBRARY_GET_CHILDREN, - COMMAND_CODE_LIBRARY_GET_ITEM, - COMMAND_CODE_LIBRARY_SEARCH, - COMMAND_CODE_LIBRARY_GET_SEARCH_RESULT - }) - @Retention(RetentionPolicy.SOURCE) - public @interface CommandCode {} - - /** * Command code for the custom command which can be defined by string action in the * {@link Session2Command}. */ public static final int COMMAND_CODE_CUSTOM = 0; - //////////////////////////////////////////////////////////////////////////////////////////////// - // Player commands (i.e. commands to {@link Session2Player}) - //////////////////////////////////////////////////////////////////////////////////////////////// - static final ArrayMap<Integer, Range> VERSION_PLAYER_COMMANDS_MAP = new ArrayMap<>(); - static final ArrayMap<Integer, Range> VERSION_PLAYER_PLAYLIST_COMMANDS_MAP = new ArrayMap<>(); - - // TODO: check the link tag, and reassign int values properly. - /** - * Command code for {@link MediaController2#play()}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, - * Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_PLAY = 10000; - - /** - * Command code for {@link MediaController2#pause()}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, - * Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_PAUSE = 10001; - - /** - * Command code for {@link MediaController2#prepare()}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, - * Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_PREPARE = 10002; - - /** - * Command code for {@link MediaController2#seekTo(long)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, - * Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SEEK_TO = 10003; - - /** - * Command code for {@link MediaController2#setPlaybackSpeed(float)}}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link Session22Callback#onCommandRequest(MediaSession2, Controller2Info, - * Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SET_SPEED = 10004; - - /** - * Command code for {@link MediaController2#getPlaylist()}. This will expose metadata - * information to the controller. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_GET_PLAYLIST = 10005; - - /** - * Command code for {@link MediaController2#setPlaylist(List, MediaMetadata)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SET_PLAYLIST = 10006; - - /** - * Command code for {@link MediaController2#skipToPlaylistItem(int)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SKIP_TO_PLAYLIST_ITEM = 10007; - - /** - * Command code for {@link MediaController2#skipToPreviousPlaylistItem()}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link Session2Callback#onCommandRequest( - * MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SKIP_TO_PREVIOUS_PLAYLIST_ITEM = 10008; - - /** - * Command code for {@link MediaController2#skipToNextPlaylistItem()}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link Session2Callback#onCommandRequest( - * MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - - public static final int COMMAND_CODE_PLAYER_SKIP_TO_NEXT_PLAYLIST_ITEM = 10009; - - /** - * Command code for {@link MediaController2#setShuffleMode(int)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SET_SHUFFLE_MODE = 10010; - - /** - * Command code for {@link MediaController2#setRepeatMode(int)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SET_REPEAT_MODE = 10011; - - /** - * Command code for {@link MediaController2#getPlaylistMetadata()}. This will expose metadata - * information to the controller. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_GET_PLAYLIST_METADATA = 10012; - - /** - * Command code for {@link MediaController2#addPlaylistItem(int, String)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_ADD_PLAYLIST_ITEM = 10013; - - /** - * Command code for {@link MediaController2#removePlaylistItem(int, String)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_REMOVE_PLAYLIST_ITEM = 10014; - - /** - * Command code for {@link MediaController2#replacePlaylistItem(int, String)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_REPLACE_PLAYLIST_ITEM = 10015; - - /** - * Command code for {@link MediaController2#getCurrentMediaItem()}. This will expose metadata - * information to the controller. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_GET_CURRENT_MEDIA_ITEM = 10016; - - /** - * Command code for {@link MediaController2#updatePlaylistMetadata(MediaMetadata)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_UPDATE_LIST_METADATA = 10017; - - /** - * Command code for {@link MediaController2#setMediaItem(String)}. - * <p> - * Command would be sent directly to the player if the session doesn't reject the request - * through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_PLAYER_SET_MEDIA_ITEM = 10018; - - static { - VERSION_PLAYER_COMMANDS_MAP.put(COMMAND_VERSION_1, - new Range(COMMAND_CODE_PLAYER_PLAY, COMMAND_CODE_PLAYER_SET_MEDIA_ITEM)); - } - - static { - VERSION_PLAYER_PLAYLIST_COMMANDS_MAP.put(COMMAND_VERSION_1, - new Range(COMMAND_CODE_PLAYER_GET_PLAYLIST, - COMMAND_CODE_PLAYER_SET_MEDIA_ITEM)); - } - - //////////////////////////////////////////////////////////////////////////////////////////////// - // Volume commands (i.e. commands to {@link AudioManager} or {@link RouteMediaPlayer}) - //////////////////////////////////////////////////////////////////////////////////////////////// - static final ArrayMap<Integer, Range> VERSION_VOLUME_COMMANDS_MAP = new ArrayMap<>(); - - /** - * Command code for {@link MediaController2#setVolumeTo(int, int)}. - * <p> - * <p> - * If the session doesn't reject the request through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}, - * command would adjust the device volume. It would send to the player directly only if it's - * remote player. See RouteMediaPlayer for a remote player. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_VOLUME_SET_VOLUME = 30000; - - /** - * Command code for {@link MediaController2#adjustVolume(int, int)}. - * <p> - * If the session doesn't reject the request through the - * {@link Session2Callback#onCommandRequest(MediaSession2, Controller2Info, Session2Command)}, - * command would adjust the device volume. It would send to the player directly only if it's - * remote player. See RouteMediaPlayer for a remote player. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_VOLUME_ADJUST_VOLUME = 30001; - - static { - VERSION_VOLUME_COMMANDS_MAP.put(COMMAND_VERSION_1, - new Range(COMMAND_CODE_VOLUME_SET_VOLUME, - COMMAND_CODE_VOLUME_ADJUST_VOLUME)); - } - - //////////////////////////////////////////////////////////////////////////////////////////////// - // Session commands (i.e. commands to {@link MediaSession2#Session2Callback}) - //////////////////////////////////////////////////////////////////////////////////////////////// - static final ArrayMap<Integer, Range> VERSION_SESSION_COMMANDS_MAP = new ArrayMap<>(); - - /** - * Command code for {@link MediaController2#fastForward()}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_SESSION_FAST_FORWARD = 40000; - - /** - * Command code for {@link MediaController2#rewind()}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_SESSION_REWIND = 40001; - - /** - * Command code for {@link MediaController2#skipForward()}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_SESSION_SKIP_FORWARD = 40002; - - /** - * Command code for {@link MediaController2#skipBackward()}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_SESSION_SKIP_BACKWARD = 40003; - - /** - * Command code for {@link MediaController2#setRating(String, Rating)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_SESSION_SET_RATING = 40010; - - /** - * @hide - */ - @IntDef(flag = false, /*prefix = "RESULT_CODE",*/ value = { - RESULT_SUCCESS, - RESULT_ERROR_UNKNOWN_ERROR, - RESULT_ERROR_INVALID_STATE, - RESULT_ERROR_BAD_VALUE, - RESULT_ERROR_PERMISSION_DENIED, - RESULT_ERROR_IO_ERROR, - RESULT_INFO_SKIPPED, - RESULT_ERROR_SESSION_DISCONNECTED, - RESULT_ERROR_NOT_SUPPORTED, - RESULT_ERROR_SESSION_AUTHENTICATION_EXPIRED, - RESULT_ERROR_SESSION_PREMIUM_ACCOUNT_REQUIRED, - RESULT_ERROR_SESSION_CONCURRENT_STREAM_LIMIT, - RESULT_ERROR_SESSION_PARENTAL_CONTROL_RESTRICTED, - RESULT_ERROR_SESSION_NOT_AVAILABLE_IN_REGION, - RESULT_ERROR_SESSION_SKIP_LIMIT_REACHED, - RESULT_ERROR_SESSION_SETUP_REQUIRED}) - @Retention(RetentionPolicy.SOURCE) - public @interface ResultCode {} - /** * Result code representing that the command is skipped or canceled. For an example, a seek * command can be skipped if it is followed by another seek command. @@ -448,73 +62,6 @@ public final class Session2Command implements Parcelable { */ public static final int RESULT_ERROR_UNKNOWN_ERROR = -1; - /** - * Result code representing that the command cannot be completed because the current state is - * not valid for the command. - */ - public static final int RESULT_ERROR_INVALID_STATE = -2; - - /** - * Result code representing that an argument is illegal. - */ - public static final int RESULT_ERROR_BAD_VALUE = -3; - - /** - * Result code representing that the command is not allowed. - */ - public static final int RESULT_ERROR_PERMISSION_DENIED = -4; - - /** - * Result code representing a file or network related command error. - */ - public static final int RESULT_ERROR_IO_ERROR = -5; - - /** - * Result code representing that the command is not supported nor implemented. - */ - public static final int RESULT_ERROR_NOT_SUPPORTED = -6; - - /** - * Result code representing that the session and controller were disconnected. - */ - public static final int RESULT_ERROR_SESSION_DISCONNECTED = -100; - - /** - * Result code representing that the authentication has expired. - */ - public static final int RESULT_ERROR_SESSION_AUTHENTICATION_EXPIRED = -102; - - /** - * Result code representing that a premium account is required. - */ - public static final int RESULT_ERROR_SESSION_PREMIUM_ACCOUNT_REQUIRED = -103; - - /** - * Result code representing that too many concurrent streams are detected. - */ - public static final int RESULT_ERROR_SESSION_CONCURRENT_STREAM_LIMIT = -104; - - /** - * Result code representing that the content is blocked due to parental controls. - */ - public static final int RESULT_ERROR_SESSION_PARENTAL_CONTROL_RESTRICTED = -105; - - /** - * Result code representing that the content is blocked due to being regionally unavailable. - */ - public static final int RESULT_ERROR_SESSION_NOT_AVAILABLE_IN_REGION = -106; - - /** - * Result code representing that the application cannot skip any more because the skip limit is - * reached. - */ - public static final int RESULT_ERROR_SESSION_SKIP_LIMIT_REACHED = -107; - - /** - * Result code representing that the session needs user's manual intervention. - */ - public static final int RESULT_ERROR_SESSION_SETUP_REQUIRED = -108; - public static final Parcelable.Creator<Session2Command> CREATOR = new Parcelable.Creator<Session2Command>() { @Override @@ -528,82 +75,17 @@ public final class Session2Command implements Parcelable { } }; - static { - VERSION_SESSION_COMMANDS_MAP.put(COMMAND_VERSION_1, - new Range(COMMAND_CODE_SESSION_FAST_FORWARD, COMMAND_CODE_SESSION_SET_RATING)); - } - - //////////////////////////////////////////////////////////////////////////////////////////////// - // Session commands (i.e. commands to {@link MediaLibrarySession#MediaLibrarySessionCallback}) - //////////////////////////////////////////////////////////////////////////////////////////////// - static final ArrayMap<Integer, Range> VERSION_LIBRARY_COMMANDS_MAP = new ArrayMap<>(); - - /** - * Command code for {@link MediaBrowser2#getLibraryRoot(Library2Params)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_LIBRARY_GET_LIBRARY_ROOT = 50000; - - /** - * Command code for {@link MediaBrowser2#subscribe(String, Library2Params)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_LIBRARY_SUBSCRIBE = 50001; - - /** - * Command code for {@link MediaBrowser2#unsubscribe(String)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_LIBRARY_UNSUBSCRIBE = 50002; - - /** - * Command code for {@link MediaBrowser2#getChildren(String, int, int, Library2Params)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_LIBRARY_GET_CHILDREN = 50003; - - /** - * Command code for {@link MediaBrowser2#getItem(String)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_LIBRARY_GET_ITEM = 50004; - - /** - * Command code for {@link MediaBrowser2#search(String, LibraryParams)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_LIBRARY_SEARCH = 50005; - - /** - * Command code for {@link MediaBrowser2#getSearchResult(String, int, int, Library2Params)}. - * <p> - * Code version is {@link #COMMAND_VERSION_1}. - */ - public static final int COMMAND_CODE_LIBRARY_GET_SEARCH_RESULT = 50006; - - static { - VERSION_LIBRARY_COMMANDS_MAP.put(COMMAND_VERSION_1, - new Range(COMMAND_CODE_LIBRARY_GET_LIBRARY_ROOT, - COMMAND_CODE_LIBRARY_GET_SEARCH_RESULT)); - } - - @CommandCode private final int mCommandCode; + private final int mCommandCode; // Nonnull if it's custom command private final String mCustomCommand; private final Bundle mExtras; /** - * Constructor for creating a predefined command. + * Constructor for creating a command predefined in AndroidX media2. * - * @param commandCode A command code for predefined command. + * @param commandCode A command code for a command predefined in AndroidX media2. */ - public Session2Command(@CommandCode int commandCode) { + public Session2Command(int commandCode) { if (commandCode == COMMAND_CODE_CUSTOM) { throw new IllegalArgumentException("commandCode shouldn't be COMMAND_CODE_CUSTOM"); } @@ -641,7 +123,7 @@ public final class Session2Command implements Parcelable { * Gets the command code of a predefined command. * This will return {@link #COMMAND_CODE_CUSTOM} for a custom command. */ - public @CommandCode int getCommandCode() { + public int getCommandCode() { return mCommandCode; } @@ -649,7 +131,8 @@ public final class Session2Command implements Parcelable { * Gets the action of a custom command. * This will return {@code null} for a predefined command. */ - public @Nullable String getCustomCommand() { + @Nullable + public String getCustomCommand() { return mCustomCommand; } @@ -657,7 +140,8 @@ public final class Session2Command implements Parcelable { * Gets the extra bundle of a custom command. * This will return {@code null} for a predefined command. */ - public @Nullable Bundle getExtras() { + @Nullable + public Bundle getExtras() { return mExtras; } @@ -720,16 +204,4 @@ public final class Session2Command implements Parcelable { return mResultData; } } - - @SuppressWarnings("WeakerAccess") /* synthetic access */ - static final class Range { - public final int lower; - public final int upper; - - Range(int lower, int upper) { - this.lower = lower; - this.upper = upper; - } - } } - diff --git a/media/java/android/media/Session2CommandGroup.java b/media/java/android/media/Session2CommandGroup.java index 18aff3007052..122dfb156567 100644 --- a/media/java/android/media/Session2CommandGroup.java +++ b/media/java/android/media/Session2CommandGroup.java @@ -17,14 +17,11 @@ package android.media; import static android.media.Session2Command.COMMAND_CODE_CUSTOM; -import static android.media.Session2Command.COMMAND_VERSION_1; import android.annotation.NonNull; import android.annotation.Nullable; -import android.media.Session2Command.Range; import android.os.Parcel; import android.os.Parcelable; -import android.util.ArrayMap; import java.util.Collection; import java.util.HashSet; @@ -61,7 +58,7 @@ public final class Session2CommandGroup implements Parcelable { /** * Default Constructor. */ - public Session2CommandGroup() { } + public Session2CommandGroup() {} /** * Creates a new Session2CommandGroup with commands copied from another object. @@ -89,38 +86,6 @@ public final class Session2CommandGroup implements Parcelable { } /** - * Adds a command to this command group. - * - * @param command A command to add. Shouldn't be {@code null}. - * @hide TODO remove this method - */ - public void addCommand(@NonNull Session2Command command) { - if (command == null) { - throw new IllegalArgumentException("command shouldn't be null"); - } - if (!hasCommand(command)) { - mCommands.add(command); - } - } - - /** - * Adds a predefined command with given {@code commandCode} to this command group. - * - * @param commandCode A command code to add. - * Shouldn't be {@link Session2Command#COMMAND_CODE_CUSTOM}. - * @hide TODO remove this method - */ - public void addCommand(@Session2Command.CommandCode int commandCode) { - if (commandCode == COMMAND_CODE_CUSTOM) { - throw new IllegalArgumentException( - "Use addCommand(Session2Command) for COMMAND_CODE_CUSTOM."); - } - if (!hasCommand(commandCode)) { - mCommands.add(new Session2Command(commandCode)); - } - } - - /** * Checks whether this command group has a command that matches given {@code command}. * * @param command A command to find. Shouldn't be {@code null}. @@ -138,7 +103,7 @@ public final class Session2CommandGroup implements Parcelable { * @param commandCode A command code to find. * Shouldn't be {@link Session2Command#COMMAND_CODE_CUSTOM}. */ - public boolean hasCommand(@Session2Command.CommandCode int commandCode) { + public boolean hasCommand(int commandCode) { if (commandCode == COMMAND_CODE_CUSTOM) { throw new IllegalArgumentException("Use hasCommand(Command) for custom command"); } @@ -153,7 +118,8 @@ public final class Session2CommandGroup implements Parcelable { /** * Gets all commands of this command group. */ - public @NonNull Set<Session2Command> getCommands() { + @NonNull + public Set<Session2Command> getCommands() { return new HashSet<>(mCommands); } @@ -191,7 +157,8 @@ public final class Session2CommandGroup implements Parcelable { * * @param command A command to add. Shouldn't be {@code null}. */ - public @NonNull Builder addCommand(@NonNull Session2Command command) { + @NonNull + public Builder addCommand(@NonNull Session2Command command) { if (command == null) { throw new IllegalArgumentException("command shouldn't be null"); } @@ -205,7 +172,8 @@ public final class Session2CommandGroup implements Parcelable { * @param commandCode A command code to add. * Shouldn't be {@link Session2Command#COMMAND_CODE_CUSTOM}. */ - public @NonNull Builder addCommand(@Session2Command.CommandCode int commandCode) { + @NonNull + public Builder addCommand(int commandCode) { if (commandCode == COMMAND_CODE_CUSTOM) { throw new IllegalArgumentException( "Use addCommand(Session2Command) for COMMAND_CODE_CUSTOM."); @@ -215,33 +183,12 @@ public final class Session2CommandGroup implements Parcelable { } /** - * Adds all predefined session commands except for the commands added after the specified - * version without default implementation. This provides convenient way to add commands - * with implementation. - * - * @param version command version - * @see Session2Command#COMMAND_VERSION_1 - * @see - * MediaSession2.Session2Callback#onConnect - */ - public @NonNull Builder addAllPredefinedCommands( - @Session2Command.CommandVersion int version) { - if (version != COMMAND_VERSION_1) { - throw new IllegalArgumentException("Unknown command version " + version); - } - addAllPlayerCommands(version); - addAllVolumeCommands(version); - addAllSessionCommands(version); - addAllLibraryCommands(version); - return this; - } - - /** * Removes a command from this group which matches given {@code command}. * * @param command A command to find. Shouldn't be {@code null}. */ - public @NonNull Builder removeCommand(@NonNull Session2Command command) { + @NonNull + public Builder removeCommand(@NonNull Session2Command command) { if (command == null) { throw new IllegalArgumentException("command shouldn't be null"); } @@ -255,7 +202,8 @@ public final class Session2CommandGroup implements Parcelable { * @param commandCode A command code to find. * Shouldn't be {@link Session2Command#COMMAND_CODE_CUSTOM}. */ - public @NonNull Builder removeCommand(@Session2Command.CommandCode int commandCode) { + @NonNull + public Builder removeCommand(int commandCode) { if (commandCode == COMMAND_CODE_CUSTOM) { throw new IllegalArgumentException("commandCode shouldn't be COMMAND_CODE_CUSTOM"); } @@ -263,59 +211,13 @@ public final class Session2CommandGroup implements Parcelable { return this; } - @NonNull Builder addAllPlayerCommands(@Session2Command.CommandVersion int version) { - addCommands(version, Session2Command.VERSION_PLAYER_COMMANDS_MAP); - return this; - } - - @NonNull Builder addAllPlayerCommands(@Session2Command.CommandVersion int version, - boolean includePlaylistCommands) { - if (includePlaylistCommands) { - return addAllPlayerCommands(version); - } - for (int i = COMMAND_VERSION_1; i <= version; i++) { - Range include = Session2Command.VERSION_PLAYER_COMMANDS_MAP.get(i); - Range exclude = Session2Command.VERSION_PLAYER_PLAYLIST_COMMANDS_MAP.get(i); - for (int code = include.lower; code <= include.upper; code++) { - if (code < exclude.lower && code > exclude.upper) { - addCommand(code); - } - } - } - return this; - } - - @NonNull Builder addAllVolumeCommands(@Session2Command.CommandVersion int version) { - addCommands(version, Session2Command.VERSION_VOLUME_COMMANDS_MAP); - return this; - } - - @NonNull Builder addAllSessionCommands(@Session2Command.CommandVersion int version) { - addCommands(version, Session2Command.VERSION_SESSION_COMMANDS_MAP); - return this; - } - - @NonNull Builder addAllLibraryCommands(@Session2Command.CommandVersion int version) { - addCommands(version, Session2Command.VERSION_LIBRARY_COMMANDS_MAP); - return this; - } - - private void addCommands( - @Session2Command.CommandVersion int version, ArrayMap<Integer, Range> map) { - for (int i = COMMAND_VERSION_1; i <= version; i++) { - Range range = map.get(i); - for (int code = range.lower; code <= range.upper; code++) { - addCommand(code); - } - } - } - /** * Builds {@link Session2CommandGroup}. * * @return a new {@link Session2CommandGroup}. */ - public @NonNull Session2CommandGroup build() { + @NonNull + public Session2CommandGroup build() { return new Session2CommandGroup(mCommands); } } diff --git a/media/java/android/media/session/SessionCallbackLink.aidl b/media/java/android/media/Session2Token.aidl index 9c0ae055cb0c..c5980e9e77fd 100644 --- a/media/java/android/media/session/SessionCallbackLink.aidl +++ b/media/java/android/media/Session2Token.aidl @@ -1,5 +1,5 @@ /* - * Copyright 2018 The Android Open Source Project + * 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.media.session; -parcelable SessionCallbackLink; +package android.media; + +parcelable Session2Token; diff --git a/media/java/android/media/Session2Token.java b/media/java/android/media/Session2Token.java index 552cc0fad7de..4634c6963675 100644 --- a/media/java/android/media/Session2Token.java +++ b/media/java/android/media/Session2Token.java @@ -102,7 +102,8 @@ public final class Session2Token implements Parcelable { private final ComponentName mComponentName; /** - * Constructor for the token. + * Constructor for the token with type {@link #TYPE_SESSION_SERVICE} or + * {@link #TYPE_LIBRARY_SERVICE}. * * @param context The context. * @param serviceComponent The component name of the service. @@ -119,7 +120,7 @@ public final class Session2Token implements Parcelable { final int uid = getUid(manager, serviceComponent.getPackageName()); // TODO: Uncomment below to stop hardcode type. - final int type = TYPE_SESSION; + final int type = TYPE_SESSION_SERVICE; // final int type; // if (isInterfaceDeclared(manager, MediaLibraryService2.SERVICE_INTERFACE, // serviceComponent)) { @@ -170,7 +171,7 @@ public final class Session2Token implements Parcelable { dest.writeString(mPackageName); dest.writeString(mServiceName); // TODO: Uncomment below - //dest.writeStrongBinder(mSessionLink.getBinder()); + //dest.writeStrongBinder(mSessionLink.asBinder()); dest.writeString(mComponentName == null ? "" : mComponentName.flattenToString()); } diff --git a/media/java/android/media/session/ControllerCallbackLink.java b/media/java/android/media/session/ControllerCallbackLink.java deleted file mode 100644 index 19da7cefe2db..000000000000 --- a/media/java/android/media/session/ControllerCallbackLink.java +++ /dev/null @@ -1,240 +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.session; - -import android.annotation.NonNull; -import android.annotation.SystemApi; -import android.media.AudioAttributes; -import android.media.MediaMetadata; -import android.media.session.MediaSession.QueueItem; -import android.os.Bundle; -import android.os.IBinder; -import android.os.Parcel; -import android.os.Parcelable; -import android.os.RemoteException; - -import java.util.List; - -/** - * Handles incoming commands to {@link MediaController.Callback}. - * @hide - */ -@SystemApi -public final class ControllerCallbackLink implements Parcelable { - CallbackStub mCallbackStub; - ISessionControllerCallback mIControllerCallback; - - /** - * Creator for stub (Callee) - */ - public ControllerCallbackLink(@NonNull CallbackStub callbackStub) { - mCallbackStub = callbackStub; - mIControllerCallback = new CallbackStubProxy(); - } - - /** - * Creator for interface (Caller) - */ - ControllerCallbackLink(Parcel in) { - mCallbackStub = null; - mIControllerCallback = ISessionControllerCallback.Stub.asInterface(in.readStrongBinder()); - } - - /** Interface method for ISessionControllerCallback.notifySessionDestroyed */ - public void notifySessionDestroyed() { - try { - mIControllerCallback.notifySessionDestroyed(); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionControllerCallback.notifyEvent */ - public void notifyEvent(String event, Bundle extras) { - try { - mIControllerCallback.notifyEvent(event, extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionControllerCallback.notifyPlaybackStateChanged */ - public void notifyPlaybackStateChanged(PlaybackState state) { - try { - mIControllerCallback.notifyPlaybackStateChanged(state); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionControllerCallback.notifyMetadataChanged */ - public void notifyMetadataChanged(MediaMetadata metadata) { - try { - mIControllerCallback.notifyMetadataChanged(metadata); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionControllerCallback.notifyQueueChanged */ - public void notifyQueueChanged(List<QueueItem> queue) { - try { - mIControllerCallback.notifyQueueChanged(queue); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionControllerCallback.notifyQueueTitleChanged */ - public void notifyQueueTitleChanged(CharSequence title) { - try { - mIControllerCallback.notifyQueueTitleChanged(title); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionControllerCallback.notifyExtrasChanged */ - public void notifyExtrasChanged(Bundle extras) { - try { - mIControllerCallback.notifyExtrasChanged(extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionControllerCallback.notifyVolumeInfoChanged */ - public void notifyVolumeInfoChanged(int volumeType, AudioAttributes attrs, int controlType, - int maxVolume, int currentVolume) { - try { - mIControllerCallback.notifyVolumeInfoChanged(volumeType, attrs, controlType, maxVolume, - currentVolume); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Gets the binder */ - public IBinder getBinder() { - return mIControllerCallback.asBinder(); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeStrongBinder(mIControllerCallback.asBinder()); - } - - public static final Parcelable.Creator<ControllerCallbackLink> CREATOR = - new Parcelable.Creator<ControllerCallbackLink>() { - @Override - public ControllerCallbackLink createFromParcel(Parcel in) { - return new ControllerCallbackLink(in); - } - - @Override - public ControllerCallbackLink[] newArray(int size) { - return new ControllerCallbackLink[size]; - } - }; - - /** - * Class for Stub implementation - */ - public abstract static class CallbackStub { - /** Stub method for ISessionControllerCallback.notifySessionDestroyed */ - public void onSessionDestroyed() { - } - - /** Stub method for ISessionControllerCallback.notifyEvent */ - public void onEvent(String event, Bundle extras) { - } - - /** Stub method for ISessionControllerCallback.notifyPlaybackStateChanged */ - public void onPlaybackStateChanged(PlaybackState state) { - } - - /** Stub method for ISessionControllerCallback.notifyMetadataChanged */ - public void onMetadataChanged(MediaMetadata metadata) { - } - - /** Stub method for ISessionControllerCallback.notifyQueueChanged */ - public void onQueueChanged(List<QueueItem> queue) { - } - - /** Stub method for ISessionControllerCallback.notifyQueueTitleChanged */ - public void onQueueTitleChanged(CharSequence title) { - } - - /** Stub method for ISessionControllerCallback.notifyExtrasChanged */ - public void onExtrasChanged(Bundle extras) { - } - - /** Stub method for ISessionControllerCallback.notifyVolumeInfoChanged */ - public void onVolumeInfoChanged(int volumeType, AudioAttributes attrs, int controlType, - int maxVolume, int currentVolume) { - } - } - - private class CallbackStubProxy extends ISessionControllerCallback.Stub { - @Override - public void notifyEvent(String event, Bundle extras) { - mCallbackStub.onEvent(event, extras); - } - - @Override - public void notifySessionDestroyed() { - mCallbackStub.onSessionDestroyed(); - } - - @Override - public void notifyPlaybackStateChanged(PlaybackState state) { - mCallbackStub.onPlaybackStateChanged(state); - } - - @Override - public void notifyMetadataChanged(MediaMetadata metadata) { - mCallbackStub.onMetadataChanged(metadata); - } - - @Override - public void notifyQueueChanged(List<QueueItem> queue) { - mCallbackStub.onQueueChanged(queue); - } - - @Override - public void notifyQueueTitleChanged(CharSequence title) { - mCallbackStub.onQueueTitleChanged(title); - } - - @Override - public void notifyExtrasChanged(Bundle extras) { - mCallbackStub.onExtrasChanged(extras); - } - - @Override - public void notifyVolumeInfoChanged(int volumeType, AudioAttributes attrs, int controlType, - int maxVolume, int currentVolume) { - mCallbackStub.onVolumeInfoChanged(volumeType, attrs, controlType, maxVolume, - currentVolume); - } - } -} diff --git a/media/java/android/media/session/ISession.aidl b/media/java/android/media/session/ISession.aidl index 5cf6dfee3b14..bfc05fa4e3a4 100644 --- a/media/java/android/media/session/ISession.aidl +++ b/media/java/android/media/session/ISession.aidl @@ -16,6 +16,7 @@ package android.media.session; import android.app.PendingIntent; +import android.content.pm.ParceledListSlice; import android.media.AudioAttributes; import android.media.MediaMetadata; import android.media.session.ISessionController; @@ -40,7 +41,7 @@ interface ISession { // These commands are for the TransportPerformer void setMetadata(in MediaMetadata metadata, long duration, String metadataDescription); void setPlaybackState(in PlaybackState state); - void setQueue(in List<MediaSession.QueueItem> queue); + void setQueue(in ParceledListSlice queue); void setQueueTitle(CharSequence title); void setExtras(in Bundle extras); void setRatingType(int type); diff --git a/media/java/android/media/session/ISessionCallback.aidl b/media/java/android/media/session/ISessionCallback.aidl index 9b86bfced340..626338d97ccb 100644 --- a/media/java/android/media/session/ISessionCallback.aidl +++ b/media/java/android/media/session/ISessionCallback.aidl @@ -17,7 +17,7 @@ package android.media.session; import android.content.Intent; import android.media.Rating; -import android.media.session.ControllerCallbackLink; +import android.media.session.ISessionControllerCallback; import android.net.Uri; import android.os.Bundle; import android.os.ResultReceiver; @@ -26,46 +26,46 @@ import android.os.ResultReceiver; * @hide */ oneway interface ISessionCallback { - void notifyCommand(String packageName, int pid, int uid, in ControllerCallbackLink caller, + void onCommand(String packageName, int pid, int uid, ISessionControllerCallback caller, String command, in Bundle args, in ResultReceiver cb); - void notifyMediaButton(String packageName, int pid, int uid, in Intent mediaButtonIntent, + void onMediaButton(String packageName, int pid, int uid, in Intent mediaButtonIntent, int sequenceNumber, in ResultReceiver cb); - void notifyMediaButtonFromController(String packageName, int pid, int uid, - in ControllerCallbackLink caller, in Intent mediaButtonIntent); + void onMediaButtonFromController(String packageName, int pid, int uid, + ISessionControllerCallback caller, in Intent mediaButtonIntent); // These callbacks are for the TransportPerformer - void notifyPrepare(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifyPrepareFromMediaId(String packageName, int pid, int uid, - in ControllerCallbackLink caller, String mediaId, in Bundle extras); - void notifyPrepareFromSearch(String packageName, int pid, int uid, - in ControllerCallbackLink caller, String query, in Bundle extras); - void notifyPrepareFromUri(String packageName, int pid, int uid, - in ControllerCallbackLink caller, in Uri uri, in Bundle extras); - void notifyPlay(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifyPlayFromMediaId(String packageName, int pid, int uid, - in ControllerCallbackLink caller, String mediaId, in Bundle extras); - void notifyPlayFromSearch(String packageName, int pid, int uid, - in ControllerCallbackLink caller, String query, in Bundle extras); - void notifyPlayFromUri(String packageName, int pid, int uid, in ControllerCallbackLink caller, + void onPrepare(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onPrepareFromMediaId(String packageName, int pid, int uid, + ISessionControllerCallback caller, String mediaId, in Bundle extras); + void onPrepareFromSearch(String packageName, int pid, int uid, + ISessionControllerCallback caller, String query, in Bundle extras); + void onPrepareFromUri(String packageName, int pid, int uid, ISessionControllerCallback caller, in Uri uri, in Bundle extras); - void notifySkipToTrack(String packageName, int pid, int uid, in ControllerCallbackLink caller, + void onPlay(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onPlayFromMediaId(String packageName, int pid, int uid, ISessionControllerCallback caller, + String mediaId, in Bundle extras); + void onPlayFromSearch(String packageName, int pid, int uid, ISessionControllerCallback caller, + String query, in Bundle extras); + void onPlayFromUri(String packageName, int pid, int uid, ISessionControllerCallback caller, + in Uri uri, in Bundle extras); + void onSkipToTrack(String packageName, int pid, int uid, ISessionControllerCallback caller, long id); - void notifyPause(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifyStop(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifyNext(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifyPrevious(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifyFastForward(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifyRewind(String packageName, int pid, int uid, in ControllerCallbackLink caller); - void notifySeekTo(String packageName, int pid, int uid, in ControllerCallbackLink caller, + void onPause(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onStop(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onNext(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onPrevious(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onFastForward(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onRewind(String packageName, int pid, int uid, ISessionControllerCallback caller); + void onSeekTo(String packageName, int pid, int uid, ISessionControllerCallback caller, long pos); - void notifyRate(String packageName, int pid, int uid, in ControllerCallbackLink caller, + void onRate(String packageName, int pid, int uid, ISessionControllerCallback caller, in Rating rating); - void notifyCustomAction(String packageName, int pid, int uid, in ControllerCallbackLink caller, + void onCustomAction(String packageName, int pid, int uid, ISessionControllerCallback caller, String action, in Bundle args); // These callbacks are for volume handling - void notifyAdjustVolume(String packageName, int pid, int uid, in ControllerCallbackLink caller, + void onAdjustVolume(String packageName, int pid, int uid, ISessionControllerCallback caller, int direction); - void notifySetVolumeTo(String packageName, int pid, int uid, - in ControllerCallbackLink caller, int value); + void onSetVolumeTo(String packageName, int pid, int uid, + ISessionControllerCallback caller, int value); } diff --git a/media/java/android/media/session/ISessionController.aidl b/media/java/android/media/session/ISessionController.aidl index 5c1915b724de..e61bf5b48223 100644 --- a/media/java/android/media/session/ISessionController.aidl +++ b/media/java/android/media/session/ISessionController.aidl @@ -17,9 +17,10 @@ package android.media.session; import android.app.PendingIntent; import android.content.Intent; +import android.content.pm.ParceledListSlice; import android.media.MediaMetadata; import android.media.Rating; -import android.media.session.ControllerCallbackLink; +import android.media.session.ISessionControllerCallback; import android.media.session.MediaSession; import android.media.session.ParcelableVolumeInfo; import android.media.session.PlaybackState; @@ -35,52 +36,53 @@ import java.util.List; * @hide */ interface ISessionController { - void sendCommand(String packageName, in ControllerCallbackLink caller, + void sendCommand(String packageName, ISessionControllerCallback caller, String command, in Bundle args, in ResultReceiver cb); - boolean sendMediaButton(String packageName, in ControllerCallbackLink caller, + boolean sendMediaButton(String packageName, ISessionControllerCallback caller, boolean asSystemService, in KeyEvent mediaButton); - void registerCallbackListener(String packageName, in ControllerCallbackLink cb); - void unregisterCallbackListener(in ControllerCallbackLink cb); + void registerCallbackListener(String packageName, ISessionControllerCallback cb); + void unregisterCallbackListener(ISessionControllerCallback cb); boolean isTransportControlEnabled(); String getPackageName(); String getTag(); PendingIntent getLaunchPendingIntent(); long getFlags(); ParcelableVolumeInfo getVolumeAttributes(); - void adjustVolume(String packageName, in ControllerCallbackLink caller, - boolean asSystemService, int direction, int flags); - void setVolumeTo(String packageName, in ControllerCallbackLink caller, + void adjustVolume(String packageName, String opPackageName, + in ISessionControllerCallback caller, boolean asSystemService, int direction, + int flags); + void setVolumeTo(String packageName, String opPackageName, in ISessionControllerCallback caller, int value, int flags); // These commands are for the TransportControls - void prepare(String packageName, in ControllerCallbackLink caller); - void prepareFromMediaId(String packageName, in ControllerCallbackLink caller, + void prepare(String packageName, ISessionControllerCallback caller); + void prepareFromMediaId(String packageName, ISessionControllerCallback caller, String mediaId, in Bundle extras); - void prepareFromSearch(String packageName, in ControllerCallbackLink caller, + void prepareFromSearch(String packageName, ISessionControllerCallback caller, String string, in Bundle extras); - void prepareFromUri(String packageName, in ControllerCallbackLink caller, + void prepareFromUri(String packageName, ISessionControllerCallback caller, in Uri uri, in Bundle extras); - void play(String packageName, in ControllerCallbackLink caller); - void playFromMediaId(String packageName, in ControllerCallbackLink caller, + void play(String packageName, ISessionControllerCallback caller); + void playFromMediaId(String packageName, ISessionControllerCallback caller, String mediaId, in Bundle extras); - void playFromSearch(String packageName, in ControllerCallbackLink caller, + void playFromSearch(String packageName, ISessionControllerCallback caller, String string, in Bundle extras); - void playFromUri(String packageName, in ControllerCallbackLink caller, + void playFromUri(String packageName, ISessionControllerCallback caller, in Uri uri, in Bundle extras); - void skipToQueueItem(String packageName, in ControllerCallbackLink caller, long id); - void pause(String packageName, in ControllerCallbackLink caller); - void stop(String packageName, in ControllerCallbackLink caller); - void next(String packageName, in ControllerCallbackLink caller); - void previous(String packageName, in ControllerCallbackLink caller); - void fastForward(String packageName, in ControllerCallbackLink caller); - void rewind(String packageName, in ControllerCallbackLink caller); - void seekTo(String packageName, in ControllerCallbackLink caller, long pos); - void rate(String packageName, in ControllerCallbackLink caller, in Rating rating); - void sendCustomAction(String packageName, in ControllerCallbackLink caller, + void skipToQueueItem(String packageName, ISessionControllerCallback caller, long id); + void pause(String packageName, ISessionControllerCallback caller); + void stop(String packageName, ISessionControllerCallback caller); + void next(String packageName, ISessionControllerCallback caller); + void previous(String packageName, ISessionControllerCallback caller); + void fastForward(String packageName, ISessionControllerCallback caller); + void rewind(String packageName, ISessionControllerCallback caller); + void seekTo(String packageName, ISessionControllerCallback caller, long pos); + void rate(String packageName, ISessionControllerCallback caller, in Rating rating); + void sendCustomAction(String packageName, ISessionControllerCallback caller, String action, in Bundle args); MediaMetadata getMetadata(); PlaybackState getPlaybackState(); - List<MediaSession.QueueItem> getQueue(); + ParceledListSlice getQueue(); CharSequence getQueueTitle(); Bundle getExtras(); int getRatingType(); diff --git a/media/java/android/media/session/ISessionControllerCallback.aidl b/media/java/android/media/session/ISessionControllerCallback.aidl index 2f86c6c8df90..cf3176706d7e 100644 --- a/media/java/android/media/session/ISessionControllerCallback.aidl +++ b/media/java/android/media/session/ISessionControllerCallback.aidl @@ -15,26 +15,25 @@ package android.media.session; -import android.media.AudioAttributes; +import android.content.pm.ParceledListSlice; import android.media.MediaMetadata; -import android.media.session.MediaSession; import android.media.session.ParcelableVolumeInfo; import android.media.session.PlaybackState; +import android.media.session.MediaSession; import android.os.Bundle; /** * @hide */ oneway interface ISessionControllerCallback { - void notifyEvent(String event, in Bundle extras); - void notifySessionDestroyed(); + void onEvent(String event, in Bundle extras); + void onSessionDestroyed(); // These callbacks are for the TransportController - void notifyPlaybackStateChanged(in PlaybackState state); - void notifyMetadataChanged(in MediaMetadata metadata); - void notifyQueueChanged(in List<MediaSession.QueueItem> queue); - void notifyQueueTitleChanged(CharSequence title); - void notifyExtrasChanged(in Bundle extras); - void notifyVolumeInfoChanged(int volumeType, in AudioAttributes attrs, int controlType, - int maxVolume, int currentVolume); + void onPlaybackStateChanged(in PlaybackState state); + void onMetadataChanged(in MediaMetadata metadata); + void onQueueChanged(in ParceledListSlice queue); + void onQueueTitleChanged(CharSequence title); + void onExtrasChanged(in Bundle extras); + void onVolumeInfoChanged(in ParcelableVolumeInfo info); } diff --git a/media/java/android/media/session/ISessionManager.aidl b/media/java/android/media/session/ISessionManager.aidl index 580196736aba..51148e2f1af4 100644 --- a/media/java/android/media/session/ISessionManager.aidl +++ b/media/java/android/media/session/ISessionManager.aidl @@ -17,12 +17,13 @@ package android.media.session; import android.content.ComponentName; import android.media.IRemoteVolumeController; +import android.media.Session2Token; import android.media.session.IActiveSessionsListener; import android.media.session.ICallback; import android.media.session.IOnMediaKeyListener; import android.media.session.IOnVolumeKeyLongPressListener; import android.media.session.ISession; -import android.media.session.SessionCallbackLink; +import android.media.session.ISessionCallback; import android.os.Bundle; import android.view.KeyEvent; @@ -31,13 +32,15 @@ import android.view.KeyEvent; * @hide */ interface ISessionManager { - ISession createSession(String packageName, in SessionCallbackLink cb, String tag, int userId); + ISession createSession(String packageName, in ISessionCallback cb, String tag, int userId); + void notifySession2Created(in Session2Token sessionToken); List<IBinder> getSessions(in ComponentName compName, int userId); void dispatchMediaKeyEvent(String packageName, boolean asSystemService, in KeyEvent keyEvent, boolean needWakeLock); - void dispatchVolumeKeyEvent(String packageName, boolean asSystemService, in KeyEvent keyEvent, - int stream, boolean musicOnly); - void dispatchAdjustVolume(String packageName, int suggestedStream, int delta, int flags); + void dispatchVolumeKeyEvent(String packageName, String opPackageName, boolean asSystemService, + in KeyEvent keyEvent, int stream, boolean musicOnly); + void dispatchAdjustVolume(String packageName, String opPackageName, int suggestedStream, + int delta, int flags); void addSessionsListener(in IActiveSessionsListener listener, in ComponentName compName, int userId); void removeSessionsListener(in IActiveSessionsListener listener); diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java index 5eb77f9b58e2..181ee5327547 100644 --- a/media/java/android/media/session/MediaController.java +++ b/media/java/android/media/session/MediaController.java @@ -21,12 +21,12 @@ import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.app.PendingIntent; import android.content.Context; +import android.content.pm.ParceledListSlice; import android.media.AudioAttributes; import android.media.AudioManager; import android.media.MediaMetadata; import android.media.Rating; import android.media.VolumeProvider; -import android.media.session.MediaSession.QueueItem; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -70,8 +70,7 @@ public final class MediaController { private final MediaSession.Token mToken; private final Context mContext; - private final ControllerCallbackLink mCbStub = - new ControllerCallbackLink(new CallbackStub(this)); + private final CallbackStub mCbStub = new CallbackStub(this); private final ArrayList<MessageHandler> mCallbacks = new ArrayList<MessageHandler>(); private final Object mLock = new Object(); @@ -154,7 +153,7 @@ public final class MediaController { return false; } try { - return mSessionBinder.sendMediaButton(mContext.getOpPackageName(), mCbStub, + return mSessionBinder.sendMediaButton(mContext.getPackageName(), mCbStub, asSystemService, keyEvent); } catch (RemoteException e) { // System is dead. =( @@ -187,8 +186,12 @@ public final class MediaController { break; } try { - mSessionBinder.adjustVolume(mContext.getOpPackageName(), mCbStub, true, - direction, AudioManager.FLAG_SHOW_UI); + // Note: Need both package name and OP package name. Package name is used for + // RemoteUserInfo, and OP package name is used for AudioService's internal + // AppOpsManager usages. + mSessionBinder.adjustVolume(mContext.getPackageName(), + mContext.getOpPackageName(), mCbStub, true, direction, + AudioManager.FLAG_SHOW_UI); } catch (RemoteException e) { Log.wtf(TAG, "Error calling adjustVolumeBy", e); } @@ -198,8 +201,11 @@ public final class MediaController { final int flags = AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_VIBRATE | AudioManager.FLAG_FROM_KEY; try { - mSessionBinder.adjustVolume(mContext.getOpPackageName(), mCbStub, true, 0, - flags); + // Note: Need both package name and OP package name. Package name is used for + // RemoteUserInfo, and OP package name is used for AudioService's internal + // AppOpsManager usages. + mSessionBinder.adjustVolume(mContext.getPackageName(), + mContext.getOpPackageName(), mCbStub, true, 0, flags); } catch (RemoteException e) { Log.wtf(TAG, "Error calling adjustVolumeBy", e); } @@ -243,7 +249,10 @@ public final class MediaController { */ public @Nullable List<MediaSession.QueueItem> getQueue() { try { - return mSessionBinder.getQueue(); + ParceledListSlice queue = mSessionBinder.getQueue(); + if (queue != null) { + return queue.getList(); + } } catch (RemoteException e) { Log.wtf(TAG, "Error calling getQueue.", e); } @@ -365,7 +374,11 @@ public final class MediaController { */ public void setVolumeTo(int value, int flags) { try { - mSessionBinder.setVolumeTo(mContext.getOpPackageName(), mCbStub, value, flags); + // Note: Need both package name and OP package name. Package name is used for + // RemoteUserInfo, and OP package name is used for AudioService's internal + // AppOpsManager usages. + mSessionBinder.setVolumeTo(mContext.getPackageName(), mContext.getOpPackageName(), + mCbStub, value, flags); } catch (RemoteException e) { Log.wtf(TAG, "Error calling setVolumeTo.", e); } @@ -386,8 +399,11 @@ public final class MediaController { */ public void adjustVolume(int direction, int flags) { try { - mSessionBinder.adjustVolume(mContext.getOpPackageName(), mCbStub, false, direction, - flags); + // Note: Need both package name and OP package name. Package name is used for + // RemoteUserInfo, and OP package name is used for AudioService's internal + // AppOpsManager usages. + mSessionBinder.adjustVolume(mContext.getPackageName(), mContext.getOpPackageName(), + mCbStub, false, direction, flags); } catch (RemoteException e) { Log.wtf(TAG, "Error calling adjustVolumeBy.", e); } @@ -453,7 +469,7 @@ public final class MediaController { throw new IllegalArgumentException("command cannot be null or empty"); } try { - mSessionBinder.sendCommand(mContext.getOpPackageName(), mCbStub, command, args, cb); + mSessionBinder.sendCommand(mContext.getPackageName(), mCbStub, command, args, cb); } catch (RemoteException e) { Log.d(TAG, "Dead object in sendCommand.", e); } @@ -519,7 +535,7 @@ public final class MediaController { if (!mCbRegistered) { try { - mSessionBinder.registerCallbackListener(mContext.getOpPackageName(), mCbStub); + mSessionBinder.registerCallbackListener(mContext.getPackageName(), mCbStub); mCbRegistered = true; } catch (RemoteException e) { Log.e(TAG, "Dead object in registerCallback", e); @@ -666,7 +682,7 @@ public final class MediaController { */ public void prepare() { try { - mSessionBinder.prepare(mContext.getOpPackageName(), mCbStub); + mSessionBinder.prepare(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling prepare.", e); } @@ -690,7 +706,7 @@ public final class MediaController { "You must specify a non-empty String for prepareFromMediaId."); } try { - mSessionBinder.prepareFromMediaId(mContext.getOpPackageName(), mCbStub, mediaId, + mSessionBinder.prepareFromMediaId(mContext.getPackageName(), mCbStub, mediaId, extras); } catch (RemoteException e) { Log.wtf(TAG, "Error calling prepare(" + mediaId + ").", e); @@ -717,7 +733,7 @@ public final class MediaController { query = ""; } try { - mSessionBinder.prepareFromSearch(mContext.getOpPackageName(), mCbStub, query, + mSessionBinder.prepareFromSearch(mContext.getPackageName(), mCbStub, query, extras); } catch (RemoteException e) { Log.wtf(TAG, "Error calling prepare(" + query + ").", e); @@ -742,7 +758,7 @@ public final class MediaController { "You must specify a non-empty Uri for prepareFromUri."); } try { - mSessionBinder.prepareFromUri(mContext.getOpPackageName(), mCbStub, uri, extras); + mSessionBinder.prepareFromUri(mContext.getPackageName(), mCbStub, uri, extras); } catch (RemoteException e) { Log.wtf(TAG, "Error calling prepare(" + uri + ").", e); } @@ -753,7 +769,7 @@ public final class MediaController { */ public void play() { try { - mSessionBinder.play(mContext.getOpPackageName(), mCbStub); + mSessionBinder.play(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling play.", e); } @@ -772,7 +788,7 @@ public final class MediaController { "You must specify a non-empty String for playFromMediaId."); } try { - mSessionBinder.playFromMediaId(mContext.getOpPackageName(), mCbStub, mediaId, + mSessionBinder.playFromMediaId(mContext.getPackageName(), mCbStub, mediaId, extras); } catch (RemoteException e) { Log.wtf(TAG, "Error calling play(" + mediaId + ").", e); @@ -795,7 +811,7 @@ public final class MediaController { query = ""; } try { - mSessionBinder.playFromSearch(mContext.getOpPackageName(), mCbStub, query, extras); + mSessionBinder.playFromSearch(mContext.getPackageName(), mCbStub, query, extras); } catch (RemoteException e) { Log.wtf(TAG, "Error calling play(" + query + ").", e); } @@ -814,7 +830,7 @@ public final class MediaController { "You must specify a non-empty Uri for playFromUri."); } try { - mSessionBinder.playFromUri(mContext.getOpPackageName(), mCbStub, uri, extras); + mSessionBinder.playFromUri(mContext.getPackageName(), mCbStub, uri, extras); } catch (RemoteException e) { Log.wtf(TAG, "Error calling play(" + uri + ").", e); } @@ -826,7 +842,7 @@ public final class MediaController { */ public void skipToQueueItem(long id) { try { - mSessionBinder.skipToQueueItem(mContext.getOpPackageName(), mCbStub, id); + mSessionBinder.skipToQueueItem(mContext.getPackageName(), mCbStub, id); } catch (RemoteException e) { Log.wtf(TAG, "Error calling skipToItem(" + id + ").", e); } @@ -838,7 +854,7 @@ public final class MediaController { */ public void pause() { try { - mSessionBinder.pause(mContext.getOpPackageName(), mCbStub); + mSessionBinder.pause(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling pause.", e); } @@ -850,7 +866,7 @@ public final class MediaController { */ public void stop() { try { - mSessionBinder.stop(mContext.getOpPackageName(), mCbStub); + mSessionBinder.stop(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling stop.", e); } @@ -863,7 +879,7 @@ public final class MediaController { */ public void seekTo(long pos) { try { - mSessionBinder.seekTo(mContext.getOpPackageName(), mCbStub, pos); + mSessionBinder.seekTo(mContext.getPackageName(), mCbStub, pos); } catch (RemoteException e) { Log.wtf(TAG, "Error calling seekTo.", e); } @@ -875,7 +891,7 @@ public final class MediaController { */ public void fastForward() { try { - mSessionBinder.fastForward(mContext.getOpPackageName(), mCbStub); + mSessionBinder.fastForward(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling fastForward.", e); } @@ -886,7 +902,7 @@ public final class MediaController { */ public void skipToNext() { try { - mSessionBinder.next(mContext.getOpPackageName(), mCbStub); + mSessionBinder.next(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling next.", e); } @@ -898,7 +914,7 @@ public final class MediaController { */ public void rewind() { try { - mSessionBinder.rewind(mContext.getOpPackageName(), mCbStub); + mSessionBinder.rewind(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling rewind.", e); } @@ -909,7 +925,7 @@ public final class MediaController { */ public void skipToPrevious() { try { - mSessionBinder.previous(mContext.getOpPackageName(), mCbStub); + mSessionBinder.previous(mContext.getPackageName(), mCbStub); } catch (RemoteException e) { Log.wtf(TAG, "Error calling previous.", e); } @@ -924,7 +940,7 @@ public final class MediaController { */ public void setRating(Rating rating) { try { - mSessionBinder.rate(mContext.getOpPackageName(), mCbStub, rating); + mSessionBinder.rate(mContext.getPackageName(), mCbStub, rating); } catch (RemoteException e) { Log.wtf(TAG, "Error calling rate.", e); } @@ -959,7 +975,7 @@ public final class MediaController { throw new IllegalArgumentException("CustomAction cannot be null."); } try { - mSessionBinder.sendCustomAction(mContext.getOpPackageName(), mCbStub, action, args); + mSessionBinder.sendCustomAction(mContext.getPackageName(), mCbStub, action, args); } catch (RemoteException e) { Log.d(TAG, "Dead object in sendCustomAction.", e); } @@ -1056,10 +1072,10 @@ public final class MediaController { } } - private static final class CallbackStub extends ControllerCallbackLink.CallbackStub { + private final static class CallbackStub extends ISessionControllerCallback.Stub { private final WeakReference<MediaController> mController; - CallbackStub(MediaController controller) { + public CallbackStub(MediaController controller) { mController = new WeakReference<MediaController>(controller); } @@ -1096,7 +1112,9 @@ public final class MediaController { } @Override - public void onQueueChanged(List<QueueItem> queue) { + public void onQueueChanged(ParceledListSlice parceledQueue) { + List<MediaSession.QueueItem> queue = parceledQueue == null ? null : parceledQueue + .getList(); MediaController controller = mController.get(); if (controller != null) { controller.postMessage(MSG_UPDATE_QUEUE, queue, null); @@ -1120,15 +1138,15 @@ public final class MediaController { } @Override - public void onVolumeInfoChanged(int volumeType, AudioAttributes attrs, int controlType, - int maxVolume, int currentVolume) { + public void onVolumeInfoChanged(ParcelableVolumeInfo pvi) { MediaController controller = mController.get(); if (controller != null) { - PlaybackInfo info = new PlaybackInfo(volumeType, attrs, controlType, maxVolume, - currentVolume); + PlaybackInfo info = new PlaybackInfo(pvi.volumeType, pvi.audioAttrs, + pvi.controlType, pvi.maxVolume, pvi.currentVolume); controller.postMessage(MSG_UPDATE_VOLUME, info, null); } } + } private final static class MessageHandler extends Handler { diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index 0332f4cbba06..8962bb7fb4c4 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -24,6 +24,7 @@ import android.app.Activity; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.content.pm.ParceledListSlice; import android.media.AudioAttributes; import android.media.MediaDescription; import android.media.MediaMetadata; @@ -129,7 +130,7 @@ public final class MediaSession { private final MediaSession.Token mSessionToken; private final MediaController mController; private final ISession mBinder; - private final SessionCallbackLink mCbStub; + private final CallbackStub mCbStub; // Do not change the name of mCallback. Support lib accesses this by using reflection. @UnsupportedAppUsage @@ -172,7 +173,7 @@ public final class MediaSession { } mMaxBitmapSize = context.getResources().getDimensionPixelSize( com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize); - mCbStub = new SessionCallbackLink(new CallbackStub(this)); + mCbStub = new CallbackStub(this); MediaSessionManager manager = (MediaSessionManager) context .getSystemService(Context.MEDIA_SESSION_SERVICE); try { @@ -466,7 +467,7 @@ public final class MediaSession { */ public void setQueue(@Nullable List<QueueItem> queue) { try { - mBinder.setQueue(queue); + mBinder.setQueue(queue == null ? null : new ParceledListSlice<QueueItem>(queue)); } catch (RemoteException e) { Log.wtf("Dead object in setQueue.", e); } @@ -1062,7 +1063,7 @@ public final class MediaSession { /** * @hide */ - public static final class CallbackStub extends SessionCallbackLink.CallbackStub { + public static class CallbackStub extends ISessionCallback.Stub { private WeakReference<MediaSession> mMediaSession; public CallbackStub(MediaSession session) { @@ -1070,14 +1071,14 @@ public final class MediaSession { } private static RemoteUserInfo createRemoteUserInfo(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { return new RemoteUserInfo(packageName, pid, uid, - caller != null ? caller.getBinder() : null); + caller != null ? caller.asBinder() : null); } @Override public void onCommand(String packageName, int pid, int uid, - ControllerCallbackLink caller, String command, Bundle args, ResultReceiver cb) { + ISessionControllerCallback caller, String command, Bundle args, ResultReceiver cb) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchCommand(createRemoteUserInfo(packageName, pid, uid, caller), @@ -1103,7 +1104,7 @@ public final class MediaSession { @Override public void onMediaButtonFromController(String packageName, int pid, int uid, - ControllerCallbackLink caller, Intent mediaButtonIntent) { + ISessionControllerCallback caller, Intent mediaButtonIntent) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchMediaButton(createRemoteUserInfo(packageName, pid, uid, caller), @@ -1113,7 +1114,7 @@ public final class MediaSession { @Override public void onPrepare(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchPrepare(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1122,7 +1123,7 @@ public final class MediaSession { @Override public void onPrepareFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, + ISessionControllerCallback caller, String mediaId, Bundle extras) { MediaSession session = mMediaSession.get(); if (session != null) { @@ -1133,7 +1134,7 @@ public final class MediaSession { @Override public void onPrepareFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, + ISessionControllerCallback caller, String query, Bundle extras) { MediaSession session = mMediaSession.get(); if (session != null) { @@ -1144,7 +1145,7 @@ public final class MediaSession { @Override public void onPrepareFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { + ISessionControllerCallback caller, Uri uri, Bundle extras) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchPrepareFromUri(createRemoteUserInfo(packageName, pid, uid, caller), @@ -1154,7 +1155,7 @@ public final class MediaSession { @Override public void onPlay(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchPlay(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1163,7 +1164,7 @@ public final class MediaSession { @Override public void onPlayFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, + ISessionControllerCallback caller, String mediaId, Bundle extras) { MediaSession session = mMediaSession.get(); if (session != null) { @@ -1174,7 +1175,7 @@ public final class MediaSession { @Override public void onPlayFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, + ISessionControllerCallback caller, String query, Bundle extras) { MediaSession session = mMediaSession.get(); if (session != null) { @@ -1185,7 +1186,7 @@ public final class MediaSession { @Override public void onPlayFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { + ISessionControllerCallback caller, Uri uri, Bundle extras) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchPlayFromUri(createRemoteUserInfo(packageName, pid, uid, caller), @@ -1195,7 +1196,7 @@ public final class MediaSession { @Override public void onSkipToTrack(String packageName, int pid, int uid, - ControllerCallbackLink caller, long id) { + ISessionControllerCallback caller, long id) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchSkipToItem(createRemoteUserInfo(packageName, pid, uid, caller), id); @@ -1204,7 +1205,7 @@ public final class MediaSession { @Override public void onPause(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchPause(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1213,7 +1214,7 @@ public final class MediaSession { @Override public void onStop(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchStop(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1222,7 +1223,7 @@ public final class MediaSession { @Override public void onNext(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchNext(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1231,7 +1232,7 @@ public final class MediaSession { @Override public void onPrevious(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchPrevious(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1240,7 +1241,7 @@ public final class MediaSession { @Override public void onFastForward(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchFastForward(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1249,7 +1250,7 @@ public final class MediaSession { @Override public void onRewind(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchRewind(createRemoteUserInfo(packageName, pid, uid, caller)); @@ -1258,7 +1259,7 @@ public final class MediaSession { @Override public void onSeekTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, long pos) { + ISessionControllerCallback caller, long pos) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchSeekTo(createRemoteUserInfo(packageName, pid, uid, caller), pos); @@ -1266,7 +1267,7 @@ public final class MediaSession { } @Override - public void onRate(String packageName, int pid, int uid, ControllerCallbackLink caller, + public void onRate(String packageName, int pid, int uid, ISessionControllerCallback caller, Rating rating) { MediaSession session = mMediaSession.get(); if (session != null) { @@ -1276,7 +1277,7 @@ public final class MediaSession { @Override public void onCustomAction(String packageName, int pid, int uid, - ControllerCallbackLink caller, String action, Bundle args) { + ISessionControllerCallback caller, String action, Bundle args) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchCustomAction(createRemoteUserInfo(packageName, pid, uid, caller), @@ -1286,7 +1287,7 @@ public final class MediaSession { @Override public void onAdjustVolume(String packageName, int pid, int uid, - ControllerCallbackLink caller, int direction) { + ISessionControllerCallback caller, int direction) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchAdjustVolume(createRemoteUserInfo(packageName, pid, uid, caller), @@ -1296,7 +1297,7 @@ public final class MediaSession { @Override public void onSetVolumeTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, int value) { + ISessionControllerCallback caller, int value) { MediaSession session = mMediaSession.get(); if (session != null) { session.dispatchSetVolumeTo(createRemoteUserInfo(packageName, pid, uid, caller), diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index 73dd55c1b88a..ef5cf008de88 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -26,6 +26,8 @@ import android.content.ComponentName; import android.content.Context; import android.media.AudioManager; import android.media.IRemoteVolumeController; +import android.media.MediaSession2; +import android.media.Session2Token; import android.media.browse.MediaBrowser; import android.os.Handler; import android.os.IBinder; @@ -96,12 +98,36 @@ public final class MediaSessionManager { * @return The binder object from the system * @hide */ - public @NonNull ISession createSession(@NonNull SessionCallbackLink cbStub, + public @NonNull ISession createSession(@NonNull MediaSession.CallbackStub cbStub, @NonNull String tag, int userId) throws RemoteException { return mService.createSession(mContext.getPackageName(), cbStub, tag, userId); } /** + * Notifies that a new {@link MediaSession2} with type {@link Session2Token#TYPE_SESSION} is + * created. + * <p> + * Do not use this API directly, but create a new instance through the + * {@link MediaSession2.Builder} instead. + * + * @param token newly created session2 token + * @hide + */ + public void notifySession2Created(@NonNull Session2Token token) { + if (token == null) { + throw new IllegalArgumentException("token shouldn't be null"); + } + if (token.getType() != Session2Token.TYPE_SESSION) { + throw new IllegalArgumentException("token's type should be TYPE_SESSION"); + } + try { + mService.notifySession2Created(token); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + } + + /** * Get a list of controllers for all ongoing sessions. The controllers will * be provided in priority order with the most important controller at index * 0. @@ -312,7 +338,7 @@ public final class MediaSessionManager { private void dispatchMediaKeyEventInternal(boolean asSystemService, @NonNull KeyEvent keyEvent, boolean needWakeLock) { try { - mService.dispatchMediaKeyEvent(mContext.getOpPackageName(), asSystemService, keyEvent, + mService.dispatchMediaKeyEvent(mContext.getPackageName(), asSystemService, keyEvent, needWakeLock); } catch (RemoteException e) { Log.e(TAG, "Failed to send key event.", e); @@ -348,8 +374,8 @@ public final class MediaSessionManager { private void dispatchVolumeKeyEventInternal(boolean asSystemService, @NonNull KeyEvent keyEvent, int stream, boolean musicOnly) { try { - mService.dispatchVolumeKeyEvent(mContext.getOpPackageName(), asSystemService, keyEvent, - stream, musicOnly); + mService.dispatchVolumeKeyEvent(mContext.getPackageName(), mContext.getOpPackageName(), + asSystemService, keyEvent, stream, musicOnly); } catch (RemoteException e) { Log.e(TAG, "Failed to send volume key event.", e); } @@ -369,8 +395,8 @@ public final class MediaSessionManager { */ public void dispatchAdjustVolume(int suggestedStream, int direction, int flags) { try { - mService.dispatchAdjustVolume(mContext.getOpPackageName(), suggestedStream, direction, - flags); + mService.dispatchAdjustVolume(mContext.getPackageName(), mContext.getOpPackageName(), + suggestedStream, direction, flags); } catch (RemoteException e) { Log.e(TAG, "Failed to send adjust volume.", e); } diff --git a/media/java/android/media/session/SessionCallbackLink.java b/media/java/android/media/session/SessionCallbackLink.java deleted file mode 100644 index b13afb5908fc..000000000000 --- a/media/java/android/media/session/SessionCallbackLink.java +++ /dev/null @@ -1,572 +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.session; - -import android.annotation.NonNull; -import android.annotation.SystemApi; -import android.content.Intent; -import android.media.Rating; -import android.net.Uri; -import android.os.Bundle; -import android.os.IBinder; -import android.os.Parcel; -import android.os.Parcelable; -import android.os.RemoteException; -import android.os.ResultReceiver; - -/** - * Handles incoming commands to {@link MediaSession.Callback}. - * @hide - */ -@SystemApi -public final class SessionCallbackLink implements Parcelable { - CallbackStub mCallbackStub; - ISessionCallback mISessionCallback; - - /** - * Creator for stub (Callee) - */ - public SessionCallbackLink(@NonNull CallbackStub callbackStub) { - mCallbackStub = callbackStub; - mISessionCallback = new CallbackStubProxy(); - } - - /** - * Creator for interface (Caller) - */ - SessionCallbackLink(Parcel in) { - mCallbackStub = null; - mISessionCallback = ISessionCallback.Stub.asInterface(in.readStrongBinder()); - } - - /** Interface method for ISessionCallback.notifyCommand */ - public void notifyCommand(String packageName, int pid, int uid, - ControllerCallbackLink caller, String command, Bundle args, ResultReceiver cb) { - try { - mISessionCallback.notifyCommand(packageName, pid, uid, caller, command, args, cb); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyMediaButton */ - public void notifyMediaButton(String packageName, int pid, int uid, - Intent mediaButtonIntent, int sequenceNumber, ResultReceiver cb) { - try { - mISessionCallback.notifyMediaButton(packageName, pid, uid, mediaButtonIntent, - sequenceNumber, cb); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyMediaButtonFromController */ - public void notifyMediaButtonFromController(String packageName, int pid, int uid, - ControllerCallbackLink caller, Intent mediaButtonIntent) { - try { - mISessionCallback.notifyMediaButtonFromController(packageName, pid, uid, caller, - mediaButtonIntent); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPrepare */ - public void notifyPrepare(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyPrepare(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPrepareFromMediaId */ - public void notifyPrepareFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { - try { - mISessionCallback.notifyPrepareFromMediaId(packageName, pid, uid, caller, mediaId, - extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPrepareFromSearch */ - public void notifyPrepareFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { - try { - mISessionCallback.notifyPrepareFromSearch(packageName, pid, uid, caller, query, extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPrepareFromUri */ - public void notifyPrepareFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { - try { - mISessionCallback.notifyPrepareFromUri(packageName, pid, uid, caller, uri, extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPlay */ - public void notifyPlay(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyPlay(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPlayFromMediaId */ - public void notifyPlayFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { - try { - mISessionCallback.notifyPlayFromMediaId(packageName, pid, uid, caller, mediaId, extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPlayFromSearch */ - public void notifyPlayFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { - try { - mISessionCallback.notifyPlayFromSearch(packageName, pid, uid, caller, query, extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPlayFromUri */ - public void notifyPlayFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { - try { - mISessionCallback.notifyPlayFromUri(packageName, pid, uid, caller, uri, extras); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifySkipToTrack */ - public void notifySkipToTrack(String packageName, int pid, int uid, - ControllerCallbackLink caller, long id) { - try { - mISessionCallback.notifySkipToTrack(packageName, pid, uid, caller, id); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPause */ - public void notifyPause(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyPause(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyStop */ - public void notifyStop(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyStop(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyNext */ - public void notifyNext(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyNext(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyPrevious */ - public void notifyPrevious(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyPrevious(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyFastForward */ - public void notifyFastForward(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyFastForward(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyRewind */ - public void notifyRewind(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - try { - mISessionCallback.notifyRewind(packageName, pid, uid, caller); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifySeekTo */ - public void notifySeekTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, long pos) { - try { - mISessionCallback.notifySeekTo(packageName, pid, uid, caller, pos); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyRate */ - public void notifyRate(String packageName, int pid, int uid, ControllerCallbackLink caller, - Rating rating) { - try { - mISessionCallback.notifyRate(packageName, pid, uid, caller, rating); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyCustomAction */ - public void notifyCustomAction(String packageName, int pid, int uid, - ControllerCallbackLink caller, String action, Bundle args) { - try { - mISessionCallback.notifyCustomAction(packageName, pid, uid, caller, action, args); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifyAdjustVolume */ - public void notifyAdjustVolume(String packageName, int pid, int uid, - ControllerCallbackLink caller, int direction) { - try { - mISessionCallback.notifyAdjustVolume(packageName, pid, uid, caller, direction); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Interface method for ISessionCallback.notifySetVolumeTo */ - public void notifySetVolumeTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, int value) { - try { - mISessionCallback.notifySetVolumeTo(packageName, pid, uid, caller, value); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - /** Gets the binder */ - public IBinder getBinder() { - return mISessionCallback.asBinder(); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeStrongBinder(mISessionCallback.asBinder()); - } - - public static final Parcelable.Creator<SessionCallbackLink> CREATOR = - new Parcelable.Creator<SessionCallbackLink>() { - @Override - public SessionCallbackLink createFromParcel(Parcel in) { - return new SessionCallbackLink(in); - } - - @Override - public SessionCallbackLink[] newArray(int size) { - return new SessionCallbackLink[size]; - } - }; - - /** - * Class for Stub implementation - */ - public abstract static class CallbackStub { - /** Stub method for ISessionCallback.notifyCommand */ - public void onCommand(String packageName, int pid, int uid, ControllerCallbackLink caller, - String command, Bundle args, ResultReceiver cb) { - } - - /** Stub method for ISessionCallback.notifyMediaButton */ - public void onMediaButton(String packageName, int pid, int uid, Intent mediaButtonIntent, - int sequenceNumber, ResultReceiver cb) { - } - - /** Stub method for ISessionCallback.notifyMediaButtonFromController */ - public void onMediaButtonFromController(String packageName, int pid, int uid, - ControllerCallbackLink caller, Intent mediaButtonIntent) { - } - - /** Stub method for ISessionCallback.notifyPrepare */ - public void onPrepare(String packageName, int pid, int uid, ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifyPrepareFromMediaId */ - public void onPrepareFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { - } - - /** Stub method for ISessionCallback.notifyPrepareFromSearch */ - public void onPrepareFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { - } - - /** Stub method for ISessionCallback.notifyPrepareFromUri */ - public void onPrepareFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { - } - - /** Stub method for ISessionCallback.notifyPlay */ - public void onPlay(String packageName, int pid, int uid, ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifyPlayFromMediaId */ - public void onPlayFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { - } - - /** Stub method for ISessionCallback.notifyPlayFromSearch */ - public void onPlayFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { - } - - /** Stub method for ISessionCallback.notifyPlayFromUri */ - public void onPlayFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { - } - - /** Stub method for ISessionCallback.notifySkipToTrack */ - public void onSkipToTrack(String packageName, int pid, int uid, - ControllerCallbackLink caller, long id) { - } - - /** Stub method for ISessionCallback.notifyPause */ - public void onPause(String packageName, int pid, int uid, ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifyStop */ - public void onStop(String packageName, int pid, int uid, ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifyNext */ - public void onNext(String packageName, int pid, int uid, ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifyPrevious */ - public void onPrevious(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifyFastForward */ - public void onFastForward(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifyRewind */ - public void onRewind(String packageName, int pid, int uid, ControllerCallbackLink caller) { - } - - /** Stub method for ISessionCallback.notifySeekTo */ - public void onSeekTo(String packageName, int pid, int uid, ControllerCallbackLink caller, - long pos) { - } - - /** Stub method for ISessionCallback.notifyRate */ - public void onRate(String packageName, int pid, int uid, ControllerCallbackLink caller, - Rating rating) { - } - - /** Stub method for ISessionCallback.notifyCustomAction */ - public void onCustomAction(String packageName, int pid, int uid, - ControllerCallbackLink caller, String action, Bundle args) { - } - - /** Stub method for ISessionCallback.notifyAdjustVolume */ - public void onAdjustVolume(String packageName, int pid, int uid, - ControllerCallbackLink caller, int direction) { - } - - /** Stub method for ISessionCallback.notifySetVolumeTo */ - public void onSetVolumeTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, int value) { - } - } - - private class CallbackStubProxy extends ISessionCallback.Stub { - @Override - public void notifyCommand(String packageName, int pid, int uid, - ControllerCallbackLink caller, String command, Bundle args, ResultReceiver cb) { - mCallbackStub.onCommand(packageName, pid, uid, caller, command, args, cb); - } - - @Override - public void notifyMediaButton(String packageName, int pid, int uid, - Intent mediaButtonIntent, int sequenceNumber, ResultReceiver cb) { - mCallbackStub.onMediaButton(packageName, pid, uid, mediaButtonIntent, sequenceNumber, - cb); - } - - @Override - public void notifyMediaButtonFromController(String packageName, int pid, int uid, - ControllerCallbackLink caller, Intent mediaButtonIntent) { - mCallbackStub.onMediaButtonFromController(packageName, pid, uid, caller, - mediaButtonIntent); - } - - @Override - public void notifyPrepare(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onPrepare(packageName, pid, uid, caller); - } - - @Override - public void notifyPrepareFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { - mCallbackStub.onPrepareFromMediaId(packageName, pid, uid, caller, mediaId, extras); - } - - @Override - public void notifyPrepareFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { - mCallbackStub.onPrepareFromSearch(packageName, pid, uid, caller, query, extras); - } - - @Override - public void notifyPrepareFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { - mCallbackStub.onPrepareFromUri(packageName, pid, uid, caller, uri, extras); - } - - @Override - public void notifyPlay(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onPlay(packageName, pid, uid, caller); - } - - @Override - public void notifyPlayFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { - mCallbackStub.onPlayFromMediaId(packageName, pid, uid, caller, mediaId, extras); - } - - @Override - public void notifyPlayFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { - mCallbackStub.onPlayFromSearch(packageName, pid, uid, caller, query, extras); - } - - @Override - public void notifyPlayFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { - mCallbackStub.onPlayFromUri(packageName, pid, uid, caller, uri, extras); - } - - @Override - public void notifySkipToTrack(String packageName, int pid, int uid, - ControllerCallbackLink caller, long id) { - mCallbackStub.onSkipToTrack(packageName, pid, uid, caller, id); - } - - @Override - public void notifyPause(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onPause(packageName, pid, uid, caller); - } - - @Override - public void notifyStop(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onStop(packageName, pid, uid, caller); - } - - @Override - public void notifyNext(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onNext(packageName, pid, uid, caller); - } - - @Override - public void notifyPrevious(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onPrevious(packageName, pid, uid, caller); - } - - @Override - public void notifyFastForward(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onFastForward(packageName, pid, uid, caller); - } - - @Override - public void notifyRewind(String packageName, int pid, int uid, - ControllerCallbackLink caller) { - mCallbackStub.onRewind(packageName, pid, uid, caller); - } - - @Override - public void notifySeekTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, long pos) { - mCallbackStub.onSeekTo(packageName, pid, uid, caller, pos); - } - - @Override - public void notifyRate(String packageName, int pid, int uid, ControllerCallbackLink caller, - Rating rating) { - mCallbackStub.onRate(packageName, pid, uid, caller, rating); - } - - @Override - public void notifyCustomAction(String packageName, int pid, int uid, - ControllerCallbackLink caller, String action, Bundle args) { - mCallbackStub.onCustomAction(packageName, pid, uid, caller, action, args); - } - - @Override - public void notifyAdjustVolume(String packageName, int pid, int uid, - ControllerCallbackLink caller, int direction) { - mCallbackStub.onAdjustVolume(packageName, pid, uid, caller, direction); - } - - @Override - public void notifySetVolumeTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, int value) { - mCallbackStub.onSetVolumeTo(packageName, pid, uid, caller, value); - } - } -} diff --git a/media/jni/Android.bp b/media/jni/Android.bp index 7481fff74765..f75f69b4f2ee 100644 --- a/media/jni/Android.bp +++ b/media/jni/Android.bp @@ -95,14 +95,16 @@ cc_library_shared { ], shared_libs: [ - "android.hardware.cas@1.0", // for CasManager. VNDK??? - "android.hardware.cas.native@1.0", // CasManager. VNDK??? + // MediaCas + "android.hardware.cas@1.0", + "android.hardware.cas.native@1.0", "android.hidl.allocator@1.0", + "libhidlbase", "libhidlmemory", - "libbinder", - "libgui", // for VideoFrameScheduler - "libhidlbase", // VNDK??? - "libpowermanager", // for JWakeLock. to be removed + + "libpowermanager", // Used by JWakeLock. Will be replace with public SDJ API. + "libmediametrics", // Used by MediaMetrics. Will be replaced with stable C API. + "libbinder", // Used by JWakeLock and MediaMetrics. "libutils", // Have to use shared lib to make libandroid_runtime behave correctly. // Otherwise, AndroidRuntime::getJNIEnv() will return NULL. @@ -124,7 +126,6 @@ cc_library_shared { "libmedia_helper", "libmedia_player2_util", "libmediaextractor", - "libmediametrics", "libmediaplayer2", "libmediaplayer2-protos", "libmediandk_utils", diff --git a/media/tests/MtpTests/Android.mk b/media/tests/MtpTests/Android.mk index 6375ed3f3c83..4cee62e7dcbf 100644 --- a/media/tests/MtpTests/Android.mk +++ b/media/tests/MtpTests/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := MtpTests LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/media/tests/MtpTests/AndroidManifest.xml b/media/tests/MtpTests/AndroidManifest.xml index 21e2b0115878..72e03f186c35 100644 --- a/media/tests/MtpTests/AndroidManifest.xml +++ b/media/tests/MtpTests/AndroidManifest.xml @@ -25,7 +25,7 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="android.mtp" android:label="MtpTests"/> </manifest> diff --git a/media/tests/MtpTests/AndroidTest.xml b/media/tests/MtpTests/AndroidTest.xml index a61a3b49c8f7..22638bca1379 100644 --- a/media/tests/MtpTests/AndroidTest.xml +++ b/media/tests/MtpTests/AndroidTest.xml @@ -10,6 +10,6 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="android.mtp"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> </test> </configuration>
\ No newline at end of file diff --git a/media/tests/MtpTests/src/android/mtp/MtpStorageManagerTest.java b/media/tests/MtpTests/src/android/mtp/MtpStorageManagerTest.java index 566d1c63fff3..1f58bdec9838 100644 --- a/media/tests/MtpTests/src/android/mtp/MtpStorageManagerTest.java +++ b/media/tests/MtpTests/src/android/mtp/MtpStorageManagerTest.java @@ -18,20 +18,19 @@ package android.mtp; import android.os.FileUtils; import android.os.UserHandle; import android.os.storage.StorageVolume; -import android.support.test.filters.SmallTest; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; -import org.junit.runners.MethodSorters; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import org.junit.runners.MethodSorters; import java.io.File; import java.io.FileOutputStream; @@ -39,8 +38,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.util.function.Predicate; -import java.util.stream.Stream; /** * Tests for MtpStorageManager functionality. diff --git a/native/webview/plat_support/Android.bp b/native/webview/plat_support/Android.bp index 96c9c1c85a60..09362566d915 100644 --- a/native/webview/plat_support/Android.bp +++ b/native/webview/plat_support/Android.bp @@ -22,6 +22,7 @@ cc_library_shared { name: "libwebviewchromium_plat_support", srcs: [ + "draw_functor.cpp", "draw_gl_functor.cpp", "draw_vk_functor.cpp", "functor_utils.cpp", diff --git a/native/webview/plat_support/draw_fn.h b/native/webview/plat_support/draw_fn.h index 8d48a58ac293..6afd8837594c 100644 --- a/native/webview/plat_support/draw_fn.h +++ b/native/webview/plat_support/draw_fn.h @@ -129,31 +129,31 @@ struct AwDrawFn_PostDrawVkParams { // Called on render thread while UI thread is blocked. Called for both GL and // VK. -typedef void AwDrawFn_OnSync(int functor, AwDrawFn_OnSyncParams* params); +typedef void AwDrawFn_OnSync(int functor, void* data, AwDrawFn_OnSyncParams* params); // Called on render thread when either the context is destroyed _or_ when the // functor's last reference goes away. Will always be called with an active // context. Called for both GL and VK. -typedef void AwDrawFn_OnContextDestroyed(int functor); +typedef void AwDrawFn_OnContextDestroyed(int functor, void* data); // Called on render thread when the last reference to the handle goes away and -// the handle is considered irrevocably destroyed. Will always be proceeded by +// the handle is considered irrevocably destroyed. Will always be preceded by // a call to OnContextDestroyed if this functor had ever been drawn. Called for // both GL and VK. -typedef void AwDrawFn_OnDestroyed(int functor); +typedef void AwDrawFn_OnDestroyed(int functor, void* data); // Only called for GL. -typedef void AwDrawFn_DrawGL(int functor, AwDrawFn_DrawGLParams* params); +typedef void AwDrawFn_DrawGL(int functor, void* data, AwDrawFn_DrawGLParams* params); // Initialize vulkan state. Needs to be called again after any // OnContextDestroyed. Only called for Vulkan. -typedef void AwDrawFn_InitVk(int functor, AwDrawFn_InitVkParams* params); +typedef void AwDrawFn_InitVk(int functor, void* data, AwDrawFn_InitVkParams* params); // Only called for Vulkan. -typedef void AwDrawFn_DrawVk(int functor, AwDrawFn_DrawVkParams* params); +typedef void AwDrawFn_DrawVk(int functor, void* data, AwDrawFn_DrawVkParams* params); // Only called for Vulkan. -typedef void AwDrawFn_PostDrawVk(int functor, +typedef void AwDrawFn_PostDrawVk(int functor, void* data, AwDrawFn_PostDrawVkParams* params); struct AwDrawFnFunctorCallbacks { @@ -176,7 +176,7 @@ enum AwDrawFnRenderMode { typedef AwDrawFnRenderMode AwDrawFn_QueryRenderMode(void); // Create a functor. |functor_callbacks| should be valid until OnDestroyed. -typedef int AwDrawFn_CreateFunctor(AwDrawFnFunctorCallbacks* functor_callbacks); +typedef int AwDrawFn_CreateFunctor(void* data, AwDrawFnFunctorCallbacks* functor_callbacks); // May be called on any thread to signal that the functor should be destroyed. // The functor will receive an onDestroyed when the last usage of it is diff --git a/native/webview/plat_support/draw_functor.cpp b/native/webview/plat_support/draw_functor.cpp new file mode 100644 index 000000000000..820bac509d2e --- /dev/null +++ b/native/webview/plat_support/draw_functor.cpp @@ -0,0 +1,144 @@ +/* + * 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. + */ + +#include "draw_fn.h" + +#include <jni.h> +#include <private/hwui/WebViewFunctor.h> +#include <utils/Log.h> + +#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0]))) +#define COMPILE_ASSERT(expr, err) \ +__unused static const char (err)[(expr) ? 1 : -1] = ""; + +namespace android { +namespace { + +struct SupportData { + void* const data; + AwDrawFnFunctorCallbacks callbacks; +}; + +void onSync(int functor, void* data, + const uirenderer::WebViewSyncData& syncData) { + AwDrawFn_OnSyncParams params = { + .version = kAwDrawFnVersion, + .apply_force_dark = syncData.applyForceDark, + }; + SupportData* support = static_cast<SupportData*>(data); + support->callbacks.on_sync(functor, support->data, ¶ms); +} + +void onContextDestroyed(int functor, void* data) { + SupportData* support = static_cast<SupportData*>(data); + support->callbacks.on_context_destroyed(functor, support->data); +} + +void onDestroyed(int functor, void* data) { + SupportData* support = static_cast<SupportData*>(data); + support->callbacks.on_destroyed(functor, support->data); + delete support; +} + +void draw_gl(int functor, void* data, + const uirenderer::DrawGlInfo& draw_gl_params) { + AwDrawFn_DrawGLParams params = { + .version = kAwDrawFnVersion, + .clip_left = draw_gl_params.clipLeft, + .clip_top = draw_gl_params.clipTop, + .clip_right = draw_gl_params.clipRight, + .clip_bottom = draw_gl_params.clipBottom, + .width = draw_gl_params.width, + .height = draw_gl_params.height, + .is_layer = draw_gl_params.isLayer, + }; + COMPILE_ASSERT(NELEM(params.transform) == NELEM(draw_gl_params.transform), + mismatched_transform_matrix_sizes); + for (int i = 0; i < NELEM(params.transform); ++i) { + params.transform[i] = draw_gl_params.transform[i]; + } + SupportData* support = static_cast<SupportData*>(data); + support->callbacks.draw_gl(functor, support->data, ¶ms); +} + +int CreateFunctor(void* data, AwDrawFnFunctorCallbacks* functor_callbacks) { + static bool callbacks_initialized = false; + static uirenderer::WebViewFunctorCallbacks webview_functor_callbacks = { + .onSync = &onSync, + .onContextDestroyed = &onContextDestroyed, + .onDestroyed = &onDestroyed, + }; + if (!callbacks_initialized) { + switch (uirenderer::WebViewFunctor_queryPlatformRenderMode()) { + case uirenderer::RenderMode::OpenGL_ES: + webview_functor_callbacks.gles.draw = &draw_gl; + break; + case uirenderer::RenderMode::Vulkan: + break; + } + callbacks_initialized = true; + } + SupportData* support = new SupportData{ + .data = data, + .callbacks = *functor_callbacks, + }; + int functor = uirenderer::WebViewFunctor_create( + support, webview_functor_callbacks, + uirenderer::WebViewFunctor_queryPlatformRenderMode()); + if (functor <= 0) delete support; + return functor; +} + +void ReleaseFunctor(int functor) { + uirenderer::WebViewFunctor_release(functor); +} + +AwDrawFnRenderMode QueryRenderMode(void) { + switch (uirenderer::WebViewFunctor_queryPlatformRenderMode()) { + case uirenderer::RenderMode::OpenGL_ES: + return AW_DRAW_FN_RENDER_MODE_OPENGL_ES; + case uirenderer::RenderMode::Vulkan: + return AW_DRAW_FN_RENDER_MODE_VULKAN; + } +} + +jlong GetDrawFnFunctionTable() { + static AwDrawFnFunctionTable function_table = { + .version = kAwDrawFnVersion, + .query_render_mode = &QueryRenderMode, + .create_functor = &CreateFunctor, + .release_functor = &ReleaseFunctor, + }; + return reinterpret_cast<intptr_t>(&function_table); +} + +const char kClassName[] = "com/android/webview/chromium/DrawFunctor"; +const JNINativeMethod kJniMethods[] = { + {"nativeGetFunctionTable", "()J", + reinterpret_cast<void*>(GetDrawFnFunctionTable)}, +}; + +} // namespace + +void RegisterDrawFunctor(JNIEnv* env) { + jclass clazz = env->FindClass(kClassName); + LOG_ALWAYS_FATAL_IF(!clazz, "Unable to find class '%s'", kClassName); + + int res = env->RegisterNatives(clazz, kJniMethods, NELEM(kJniMethods)); + LOG_ALWAYS_FATAL_IF(res < 0, "register native methods failed: res=%d", res); +} + +} // namespace android diff --git a/native/webview/plat_support/jni_entry_point.cpp b/native/webview/plat_support/jni_entry_point.cpp index 4771be1bc258..9599fa6da516 100644 --- a/native/webview/plat_support/jni_entry_point.cpp +++ b/native/webview/plat_support/jni_entry_point.cpp @@ -21,6 +21,7 @@ namespace android { +void RegisterDrawFunctor(JNIEnv* env); void RegisterDrawGLFunctor(JNIEnv* env); void RegisterGraphicsUtils(JNIEnv* env); @@ -30,6 +31,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { JNIEnv* env = NULL; jint ret = vm->AttachCurrentThread(&env, NULL); LOG_ALWAYS_FATAL_IF(ret != JNI_OK, "AttachCurrentThread failed"); + android::RegisterDrawFunctor(env); android::RegisterDrawGLFunctor(env); android::RegisterGraphicsUtils(env); diff --git a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java index 3c0a2973ad40..0c352043f2a3 100644 --- a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java +++ b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java @@ -20,11 +20,9 @@ import android.content.Context; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.ViewMediatorCallback; -import com.android.systemui.car.CarNotificationEntryManager; import com.android.systemui.car.CarNotificationInterruptionStateProvider; import com.android.systemui.statusbar.car.CarFacetButtonController; import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager; -import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.volume.CarVolumeDialogComponent; @@ -65,16 +63,16 @@ public class CarSystemUIFactory extends SystemUIFactory { } @Override - public NotificationEntryManager provideNotificationEntryManager(Context context) { - return new CarNotificationEntryManager(context); - } - - @Override public NotificationInterruptionStateProvider provideNotificationInterruptionStateProvider( Context context) { return new CarNotificationInterruptionStateProvider(context); } + @Override + public boolean provideAllowNotificationLongPress() { + return false; + } + @Module protected static class ContextHolder { private Context mContext; diff --git a/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java b/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java deleted file mode 100644 index 323cae0067d8..000000000000 --- a/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java +++ /dev/null @@ -1,41 +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.systemui.car; - -import android.content.Context; - -import com.android.systemui.statusbar.notification.NotificationEntryManager; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; - -public class CarNotificationEntryManager extends NotificationEntryManager { - public CarNotificationEntryManager(Context context) { - super(context); - } - - /** - * Returns the - * {@link ExpandableNotificationRow.LongPressListener} that will - * be triggered when a notification card is long-pressed. - */ - @Override - public ExpandableNotificationRow.LongPressListener getNotificationLongClicker() { - // For the automative use case, we do not want to the user to be able to interact with - // a notification other than a regular click. As a result, just return null for the - // long click listener. - return null; - } -} diff --git a/packages/ExtServices/src/android/ext/services/notification/EntityTypeCounter.java b/packages/ExtServices/src/android/ext/services/notification/EntityTypeCounter.java new file mode 100644 index 000000000000..50cb0abd6329 --- /dev/null +++ b/packages/ExtServices/src/android/ext/services/notification/EntityTypeCounter.java @@ -0,0 +1,73 @@ +/** + * 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.ext.services.notification; + +import android.annotation.NonNull; +import android.util.ArrayMap; +import android.view.textclassifier.TextClassifier; +import android.view.textclassifier.TextLinks; + +/** + * Counts the entity types for smart actions. Some entity types are considered the same + * type, like {@link TextClassifier#TYPE_DATE} and {@link TextClassifier#TYPE_DATE_TIME}. + */ +class EntityTypeCounter { + + private static final ArrayMap<String, String> ENTITY_TYPE_MAPPING = new ArrayMap<>(); + + static { + ENTITY_TYPE_MAPPING.put(TextClassifier.TYPE_DATE_TIME, TextClassifier.TYPE_DATE); + } + + private final ArrayMap<String, Integer> mEntityTypeCount = new ArrayMap<>(); + + + void increment(@NonNull String entityType) { + entityType = convertToBaseEntityType(entityType); + if (mEntityTypeCount.containsKey(entityType)) { + mEntityTypeCount.put(entityType, mEntityTypeCount.get(entityType) + 1); + } else { + mEntityTypeCount.put(entityType, 1); + } + } + + int getCount(@NonNull String entityType) { + entityType = convertToBaseEntityType(entityType); + return mEntityTypeCount.getOrDefault(entityType, 0); + } + + @NonNull + private String convertToBaseEntityType(@NonNull String entityType) { + return ENTITY_TYPE_MAPPING.getOrDefault(entityType, entityType); + } + + /** + * Given the links extracted from a piece of text, returns the frequency of each entity + * type. + */ + @NonNull + static EntityTypeCounter fromTextLinks(@NonNull TextLinks links) { + EntityTypeCounter counter = new EntityTypeCounter(); + for (TextLinks.TextLink link : links.getLinks()) { + if (link.getEntityCount() == 0) { + continue; + } + String entityType = link.getEntity(0); + counter.increment(entityType); + } + return counter; + } +} diff --git a/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java b/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java index b041842c45b9..f2db2da42527 100644 --- a/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java +++ b/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java @@ -26,7 +26,6 @@ import android.os.Parcelable; import android.os.Process; import android.service.notification.NotificationAssistantService; import android.text.TextUtils; -import android.util.ArrayMap; import android.util.LruCache; import android.view.textclassifier.ConversationActions; import android.view.textclassifier.TextClassification; @@ -356,7 +355,7 @@ public class SmartActionsHelper { TextClassifier.HINT_TEXT_IS_NOT_EDITABLE))) .build(); TextLinks links = mTextClassifier.generateLinks(textLinksRequest); - ArrayMap<String, Integer> entityTypeFrequency = getEntityTypeFrequency(links); + EntityTypeCounter entityTypeCounter = EntityTypeCounter.fromTextLinks(links); ArrayList<Notification.Action> actions = new ArrayList<>(); for (TextLinks.TextLink link : links.getLinks()) { @@ -364,7 +363,7 @@ public class SmartActionsHelper { // case where a notification contains e.g. a list of phone numbers. In such cases, the // user likely wants to act on the whole list rather than an individual entity. if (link.getEntityCount() == 0 - || entityTypeFrequency.get(link.getEntity(0)) != 1) { + || entityTypeCounter.getCount(link.getEntity(0)) != 1) { continue; } @@ -384,8 +383,7 @@ public class SmartActionsHelper { remoteAction.getIcon(), remoteAction.getTitle(), remoteAction.getActionIntent()) - .setSemanticAction( - Notification.Action.SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION) + .setContextual(true) .addExtras(Bundle.forPair(KEY_ACTION_TYPE, classification.getEntity(0))) .build(); actions.add(action); @@ -398,25 +396,4 @@ public class SmartActionsHelper { } return actions; } - - /** - * Given the links extracted from a piece of text, returns the frequency of each entity - * type. - */ - @NonNull - private ArrayMap<String, Integer> getEntityTypeFrequency(@NonNull TextLinks links) { - ArrayMap<String, Integer> entityTypeCount = new ArrayMap<>(); - for (TextLinks.TextLink link : links.getLinks()) { - if (link.getEntityCount() == 0) { - continue; - } - String entityType = link.getEntity(0); - if (entityTypeCount.containsKey(entityType)) { - entityTypeCount.put(entityType, entityTypeCount.get(entityType) + 1); - } else { - entityTypeCount.put(entityType, 1); - } - } - return entityTypeCount; - } } diff --git a/packages/ExtServices/tests/src/android/ext/services/notification/EntityTypeCounterTest.java b/packages/ExtServices/tests/src/android/ext/services/notification/EntityTypeCounterTest.java new file mode 100644 index 000000000000..2d29c7b77759 --- /dev/null +++ b/packages/ExtServices/tests/src/android/ext/services/notification/EntityTypeCounterTest.java @@ -0,0 +1,58 @@ +/** + * 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.ext.services.notification; + +import static com.google.common.truth.Truth.assertThat; + +import android.support.test.runner.AndroidJUnit4; +import android.view.textclassifier.TextClassifier; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class EntityTypeCounterTest { + private EntityTypeCounter mCounter; + + @Before + public void setup() { + mCounter = new EntityTypeCounter(); + } + + @Test + public void testIncrementAndGetCount() { + mCounter.increment(TextClassifier.TYPE_URL); + mCounter.increment(TextClassifier.TYPE_URL); + mCounter.increment(TextClassifier.TYPE_URL); + + mCounter.increment(TextClassifier.TYPE_PHONE); + mCounter.increment(TextClassifier.TYPE_PHONE); + + assertThat(mCounter.getCount(TextClassifier.TYPE_URL)).isEqualTo(3); + assertThat(mCounter.getCount(TextClassifier.TYPE_PHONE)).isEqualTo(2); + assertThat(mCounter.getCount(TextClassifier.TYPE_DATE_TIME)).isEqualTo(0); + } + + @Test + public void testIncrementAndGetCount_typeDateAndDateTime() { + mCounter.increment(TextClassifier.TYPE_DATE_TIME); + mCounter.increment(TextClassifier.TYPE_DATE); + + assertThat(mCounter.getCount(TextClassifier.TYPE_DATE_TIME)).isEqualTo(2); + assertThat(mCounter.getCount(TextClassifier.TYPE_DATE)).isEqualTo(2); + } +} diff --git a/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml b/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml index 1a4d7b7dee14..b063e13bcc12 100644 --- a/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml +++ b/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml @@ -33,33 +33,49 @@ android:textAppearance="@style/BarChart.Text.HeaderTitle"/> <LinearLayout + android:id="@+id/bar_views_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center|bottom"> + android:gravity="center" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center|bottom"> - <com.android.settingslib.widget.BarView - android:id="@+id/bar_view1" - style="@style/BarViewStyle" - settings:barColor="#FA7B17"/> - <com.android.settingslib.widget.BarView - android:id="@+id/bar_view2" - style="@style/BarViewStyle" - settings:barColor="#F439A0"/> - <com.android.settingslib.widget.BarView - android:id="@+id/bar_view3" - style="@style/BarViewStyle" - settings:barColor="#A142F4"/> - <com.android.settingslib.widget.BarView - android:id="@+id/bar_view4" - style="@style/BarViewStyle" - settings:barColor="#24C1E0"/> + <com.android.settingslib.widget.BarView + android:id="@+id/bar_view1" + style="@style/BarViewStyle" + settings:barColor="#FA7B17"/> + <com.android.settingslib.widget.BarView + android:id="@+id/bar_view2" + style="@style/BarViewStyle" + settings:barColor="#F439A0"/> + <com.android.settingslib.widget.BarView + android:id="@+id/bar_view3" + style="@style/BarViewStyle" + settings:barColor="#A142F4"/> + <com.android.settingslib.widget.BarView + android:id="@+id/bar_view4" + style="@style/BarViewStyle" + settings:barColor="#24C1E0"/> + </LinearLayout> + + <Button + android:id="@+id/bar_chart_details" + style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored" + android:layout_width="wrap_content" + android:layout_height="48dp" + android:gravity="center"/> </LinearLayout> - <Button - android:id="@+id/bar_chart_details" - style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored" - android:layout_width="wrap_content" - android:layout_height="48dp" - android:gravity="center"/> + <TextView + android:id="@+id/empty_view" + android:layout_width="match_parent" + android:layout_height="@dimen/settings_bar_view_max_height" + android:gravity="center" + android:visibility="gone" + android:textAppearance="@style/BarChart.Text.Summary"/> </LinearLayout> diff --git a/packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartInfo.java b/packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartInfo.java new file mode 100644 index 000000000000..eeaf2737a2fd --- /dev/null +++ b/packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartInfo.java @@ -0,0 +1,176 @@ +/* + * 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.widget; + +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + +import java.util.ArrayList; +import java.util.List; + +/** + * BarChartInfo is responsible for storing information about {@link BarChartPreference}. + */ +public class BarChartInfo { + @StringRes + private final int mTitle; + @StringRes + private final int mDetails; + @StringRes + private final int mEmptyText; + private final View.OnClickListener mDetailsOnClickListener; + + private BarViewInfo[] mBarViewInfos; + + /** + * Gets the resource id for the title shown in {@link BarChartPreference}. + * + * @return the string resource id for title. + */ + public int getTitle() { + return mTitle; + } + + /** + * Gets the resource id for the details shown in {@link BarChartPreference}. + * + * @return the string resource id for details. + */ + public int getDetails() { + return mDetails; + } + + /** + * Gets the resource id for the empty text shown in {@link BarChartPreference} when there is no + * any bar view in {@link BarChartPreference}. + * + * @return the string resource id for empty text. + */ + public int getEmptyText() { + return mEmptyText; + } + + /** + * Gets the click listener for the details view. + * + * @return click listener for details view. + */ + public View.OnClickListener getDetailsOnClickListener() { + return mDetailsOnClickListener; + } + + /** + * Gets an array which contains up to four {@link BarViewInfo} + * + * @return an array holding the current all {@link BarViewInfo} state of the bar chart. + */ + public BarViewInfo[] getBarViewInfos() { + return mBarViewInfos; + } + + void setBarViewInfos(BarViewInfo[] barViewInfos) { + mBarViewInfos = barViewInfos; + } + + private BarChartInfo(Builder builder) { + mTitle = builder.mTitle; + mDetails = builder.mDetails; + mEmptyText = builder.mEmptyText; + mDetailsOnClickListener = builder.mDetailsOnClickListener; + + if (builder.mBarViewInfos != null) { + mBarViewInfos = builder.mBarViewInfos.stream().toArray(BarViewInfo[]::new); + } + } + + /** + * Builder class for {@link BarChartInfo} + */ + public static class Builder { + @StringRes + private int mTitle; + @StringRes + private int mDetails; + @StringRes + private int mEmptyText; + private View.OnClickListener mDetailsOnClickListener; + private List<BarViewInfo> mBarViewInfos; + + /** + * Creates an instance of a {@link BarChartInfo} based on the current builder settings. + * + * @return The {@link BarChartInfo}. + */ + public BarChartInfo build() { + if (mTitle == 0) { + throw new IllegalStateException("You must call Builder#setTitle() once."); + } + return new BarChartInfo(this); + } + + /** + * Sets the string resource id for the title. + */ + public Builder setTitle(@StringRes int title) { + mTitle = title; + return this; + } + + /** + * Sets the string resource id for the details. + */ + public Builder setDetails(@StringRes int details) { + mDetails = details; + return this; + } + + /** + * Sets the string resource id for the empty text. + */ + public Builder setEmptyText(@StringRes int emptyText) { + mEmptyText = emptyText; + return this; + } + + /** + * Sets the click listener for details view. + */ + public Builder setDetailsOnClickListener( + @Nullable View.OnClickListener clickListener) { + mDetailsOnClickListener = clickListener; + return this; + } + + /** + * Adds a {@link BarViewInfo} for {@link BarChartPreference}. + * Maximum of 4 {@link BarViewInfo} can be added. + */ + public Builder addBarViewInfo(@NonNull BarViewInfo barViewInfo) { + if (mBarViewInfos == null) { + mBarViewInfos = new ArrayList<>(); + } + if (mBarViewInfos.size() >= BarChartPreference.MAXIMUM_BAR_VIEWS) { + throw new IllegalStateException("We only support up to four bar views"); + } + mBarViewInfos.add(barViewInfo); + return this; + } + } +} diff --git a/packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartPreference.java b/packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartPreference.java index 0a4b24c8918b..eed66e94a9ef 100644 --- a/packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartPreference.java +++ b/packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartPreference.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2019 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; @@ -41,31 +40,45 @@ import java.util.Arrays; * android:key="bar_chart"/> * </pre> * - * <p>This code sample demonstrates how to initialize the contents of the BarChartPreference defined - * in the previous XML layout: + * <p>This code sample demonstrates how to initialize the contents of the BarChartPreference + * defined in the previous XML layout: * * <pre> - * BarViewInfo[] viewsInfo = new BarViewInfo [] { - * new BarViewInfo(icon, 18, res of summary), - * new BarViewInfo(icon, 25, res of summary), - * new BarViewInfo(icon, 10, res of summary), - * new BarViewInfo(icon, 3, res of summary), - * }; + * BarChartPreference preference = ((BarChartPreference) findPreference("bar_chart")); + * + * BarChartInfo info = new BarChartInfo.Builder() + * .setTitle(R.string.permission_bar_chart_title) + * .setDetails(R.string.permission_bar_chart_details) + * .setEmptyText(R.string.permission_bar_chart_empty_text) + * .addBarViewInfo(new barViewInfo(...)) + * .addBarViewInfo(new barViewInfo(...)) + * .addBarViewInfo(new barViewInfo(...)) + * .addBarViewInfo(new barViewInfo(...)) + * .setDetailsOnClickListener(v -> doSomething()) + * .build(); + * + * preference.initializeBarChart(info); * </pre> * + * + * <p>You also can update new information for bar views by + * {@link BarChartPreference#setBarViewInfos(BarViewInfo[])} + * * <pre> - * BarChartPreference preference = ((BarChartPreference) findPreference("bar_chart")); + * BarViewInfo[] barViewsInfo = new BarViewInfo [] { + * new BarViewInfo(...), + * new BarViewInfo(...), + * new BarViewInfo(...), + * new BarViewInfo(...), + * }; * - * preference.setBarChartTitleRes(R.string.title_res); - * preference.setBarChartDetailsRes(R.string.details_res); - * preference.setBarChartDetailsClickListener(v -> doSomething()); - * preference.setAllBarViewsData(viewsInfo); + * preference.setBarViewInfos(barViewsInfo); * </pre> */ public class BarChartPreference extends Preference { + static final int MAXIMUM_BAR_VIEWS = 4; private static final String TAG = "BarChartPreference"; - private static final int MAXIMUM_BAR_VIEWS = 4; private static final int[] BAR_VIEWS = { R.id.bar_view1, R.id.bar_view2, @@ -74,12 +87,7 @@ public class BarChartPreference extends Preference { }; private int mMaxBarHeight; - @StringRes - private int mTitleId; - @StringRes - private int mDetailsId; - private BarViewInfo[] mBarViewsInfo; - private View.OnClickListener mDetailsOnClickListener; + private BarChartInfo mBarChartInfo; public BarChartPreference(Context context) { super(context); @@ -103,40 +111,26 @@ public class BarChartPreference extends Preference { } /** - * Set the text resource for bar chart title. - */ - public void setBarChartTitle(@StringRes int resId) { - mTitleId = resId; - notifyChanged(); - } - - /** - * Set the text resource for bar chart details. - */ - public void setBarChartDetails(@StringRes int resId) { - mDetailsId = resId; - notifyChanged(); - } - - /** - * Register a callback to be invoked when bar chart details view is clicked. + * According to the information in {@link BarChartInfo} to initialize bar chart. + * + * @param barChartInfo The barChartInfo contains title, details, empty text, click listener + * attached on details view and four bar views. */ - public void setBarChartDetailsClickListener(@Nullable View.OnClickListener clickListener) { - mDetailsOnClickListener = clickListener; + public void initializeBarChart(@NonNull BarChartInfo barChartInfo) { + mBarChartInfo = barChartInfo; notifyChanged(); } /** - * Set all bar view information which you'd like to show in preference. + * Sets all bar view information which you'd like to show in preference. * - * @param barViewsInfo the barViewsInfo contain at least one {@link BarViewInfo}. + * @param barViewInfos the barViewInfos contain at least one {@link BarViewInfo}. */ - public void setAllBarViewsInfo(@NonNull BarViewInfo[] barViewsInfo) { - mBarViewsInfo = barViewsInfo; - // Do a sort in descending order, the first element would have max {@link - // BarViewInfo#mBarNumber} - Arrays.sort(mBarViewsInfo); - calculateAllBarViewHeights(); + public void setBarViewInfos(@Nullable BarViewInfo[] barViewInfos) { + if (barViewInfos != null && barViewInfos.length > MAXIMUM_BAR_VIEWS) { + throw new IllegalStateException("We only support up to four bar views"); + } + mBarChartInfo.setBarViewInfos(barViewInfos); notifyChanged(); } @@ -146,7 +140,17 @@ public class BarChartPreference extends Preference { holder.setDividerAllowedAbove(true); holder.setDividerAllowedBelow(true); + // We must show title of bar chart. bindChartTitleView(holder); + + final BarViewInfo[] barViewInfos = mBarChartInfo.getBarViewInfos(); + // If there is no any bar view, we just show an empty text. + if (barViewInfos == null || barViewInfos.length == 0) { + setEmptyViewVisible(holder, true /* visible */); + return; + } + setEmptyViewVisible(holder, false /* visible */); + bindChartDetailsView(holder); updateBarChart(holder); } @@ -160,43 +164,68 @@ public class BarChartPreference extends Preference { private void bindChartTitleView(PreferenceViewHolder holder) { final TextView titleView = (TextView) holder.findViewById(R.id.bar_chart_title); - titleView.setText(mTitleId); + titleView.setText(mBarChartInfo.getTitle()); } private void bindChartDetailsView(PreferenceViewHolder holder) { final Button detailsView = (Button) holder.findViewById(R.id.bar_chart_details); - if (mDetailsId == 0) { + final int details = mBarChartInfo.getDetails(); + if (details == 0) { detailsView.setVisibility(View.GONE); } else { detailsView.setVisibility(View.VISIBLE); - detailsView.setText(mDetailsId); - detailsView.setOnClickListener(mDetailsOnClickListener); + detailsView.setText(details); + detailsView.setOnClickListener(mBarChartInfo.getDetailsOnClickListener()); } } private void updateBarChart(PreferenceViewHolder holder) { + normalizeBarViewHeights(); + + final BarViewInfo[] barViewInfos = mBarChartInfo.getBarViewInfos(); + for (int index = 0; index < MAXIMUM_BAR_VIEWS; index++) { final BarView barView = (BarView) holder.findViewById(BAR_VIEWS[index]); - // If there is no bar views data can be shown. - if (mBarViewsInfo == null || index >= mBarViewsInfo.length) { + // If there is no bar view info can be shown. + if (barViewInfos == null || index >= barViewInfos.length) { barView.setVisibility(View.GONE); continue; } barView.setVisibility(View.VISIBLE); - barView.updateView(mBarViewsInfo[index]); + barView.updateView(barViewInfos[index]); } } - private void calculateAllBarViewHeights() { + private void normalizeBarViewHeights() { + final BarViewInfo[] barViewInfos = mBarChartInfo.getBarViewInfos(); + // If there is no any bar view info, we don't need to calculate the height of all bar views. + if (barViewInfos == null || barViewInfos.length == 0) { + return; + } + // Do a sort in descending order, the first element would have max {@link + // BarViewInfo#mHeight} + Arrays.sort(barViewInfos); // Since we sorted this array in advance, the first element must have the max {@link // BarViewInfo#mHeight}. - final int maxBarHeight = mBarViewsInfo[0].getHeight(); + final int maxBarHeight = barViewInfos[0].getHeight(); // If the max number of bar view is zero, then we don't calculate the unit for bar height. final int unit = maxBarHeight == 0 ? 0 : mMaxBarHeight / maxBarHeight; - for (BarViewInfo barView : mBarViewsInfo) { + for (BarViewInfo barView : barViewInfos) { barView.setNormalizedHeight(barView.getHeight() * unit); } } + + private void setEmptyViewVisible(PreferenceViewHolder holder, boolean visible) { + final View barViewsContainer = holder.findViewById(R.id.bar_views_container); + final TextView emptyView = (TextView) holder.findViewById(R.id.empty_view); + final int emptyTextRes = mBarChartInfo.getEmptyText(); + + if (emptyTextRes != 0) { + emptyView.setText(emptyTextRes); + } + emptyView.setVisibility(visible ? View.VISIBLE : View.GONE); + barViewsContainer.setVisibility(visible ? View.GONE : View.VISIBLE); + } } diff --git a/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml b/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml index cbebbb32dc89..d6dc211ad8c4 100644 --- a/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml +++ b/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml @@ -18,12 +18,11 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:paddingMode="stack"> <item> - <shape - android:tint="?android:attr/colorForeground"> + <shape> <corners android:radius="20dp"/> <solid - android:color="@android:color/transparent"/> + android:color="?android:attr/colorPrimary"/> <stroke android:color="#1f000000" android:width="1dp"/> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 842779d494cd..7dcc3acb1dae 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1138,7 +1138,7 @@ <string name="notice_header" translatable="false"></string> <!-- UI debug setting: opt in to use updated graphics driver? [CHAR LIMIT=100] --> - <string name="updated_gfx_driver_dev_opt_in_app_summary">Opt in app to use updated graphcis driver in developement</string> + <string name="gup_dev_opt_in_app_summary">Opt in app to use Game Update Package in developement</string> <!-- Name of the phone device [CHAR LIMIT=NONE] --> <string name="media_transfer_phone_device_name">Phone speaker</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsSummaryHelper.java b/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsSummaryHelper.java index 2387b01d341d..5e5c22a403d2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsSummaryHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsSummaryHelper.java @@ -16,8 +16,8 @@ package com.android.settingslib.applications; import android.content.Context; +import android.permission.PermissionControllerManager; import android.permission.RuntimePermissionPresentationInfo; -import android.permission.RuntimePermissionPresenter; import java.text.Collator; import java.util.ArrayList; @@ -28,9 +28,9 @@ public class PermissionsSummaryHelper { public static void getPermissionSummary(Context context, String pkg, final PermissionsResultCallback callback) { - final RuntimePermissionPresenter presenter = - RuntimePermissionPresenter.getInstance(context); - presenter.getAppPermissions(pkg, permissions -> { + final PermissionControllerManager permController = + context.getSystemService(PermissionControllerManager.class); + permController.getAppPermissions(pkg, permissions -> { final int permissionCount = permissions.size(); int grantedStandardCount = 0; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java index 58feef55bd29..24d7011d9a35 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java @@ -35,7 +35,6 @@ import java.util.List; public class A2dpProfile implements LocalBluetoothProfile { private static final String TAG = "A2dpProfile"; - private static boolean V = false; private Context mContext; @@ -60,7 +59,6 @@ public class A2dpProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - if (V) Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothA2dp) proxy; // We just bound to the service, so refresh the UI for any connected A2DP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -79,7 +77,6 @@ public class A2dpProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - if (V) Log.d(TAG,"Bluetooth service disconnected"); mIsProfileReady=false; } } @@ -302,7 +299,7 @@ public class A2dpProfile implements LocalBluetoothProfile { } protected void finalize() { - if (V) Log.d(TAG, "finalize()"); + Log.d(TAG, "finalize()"); if (mService != null) { try { BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.A2DP, diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java index 988062de0a37..873dd1a643a4 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java @@ -55,7 +55,6 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG, "Bluetooth service connected"); mService = (BluetoothA2dpSink) proxy; // We just bound to the service, so refresh the UI for any connected A2DP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -74,7 +73,6 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - Log.d(TAG, "Bluetooth service disconnected"); mIsProfileReady=false; } } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java index 62507f58426f..6b6df9b928e5 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java @@ -58,7 +58,6 @@ public class HeadsetProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothHeadset) proxy; // We just bound to the service, so refresh the UI for any connected HFP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -80,7 +79,6 @@ public class HeadsetProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - Log.d(TAG,"Bluetooth service disconnected"); mProfileManager.callServiceDisconnectedListeners(); mIsProfileReady=false; } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java index adb5ab34b5c1..577d98d93405 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java @@ -51,7 +51,6 @@ public class HearingAidProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - if (V) Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothHearingAid) proxy; // We just bound to the service, so refresh the UI for any connected HearingAid devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -77,7 +76,6 @@ public class HearingAidProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - if (V) Log.d(TAG,"Bluetooth service disconnected"); mIsProfileReady=false; } } @@ -234,7 +232,7 @@ public class HearingAidProfile implements LocalBluetoothProfile { } protected void finalize() { - if (V) Log.d(TAG, "finalize()"); + Log.d(TAG, "finalize()"); if (mService != null) { try { BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEARING_AID, diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java index 4879144a5994..c6bb2b304d6c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java @@ -59,7 +59,6 @@ final class HfpClientProfile implements LocalBluetoothProfile { @Override public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG, "Bluetooth service connected"); mService = (BluetoothHeadsetClient) proxy; // We just bound to the service, so refresh the UI for any connected HFP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -80,7 +79,6 @@ final class HfpClientProfile implements LocalBluetoothProfile { @Override public void onServiceDisconnected(int profile) { - Log.d(TAG, "Bluetooth service disconnected"); mIsProfileReady=false; } } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java index 61e5b6b3e125..4dc050c6d5e3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java @@ -58,7 +58,6 @@ public class HidDeviceProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG, "Bluetooth service connected :-), profile:" + profile); mService = (BluetoothHidDevice) proxy; // We just bound to the service, so refresh the UI for any connected HID devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -78,7 +77,6 @@ public class HidDeviceProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - Log.d(TAG, "Bluetooth service disconnected, profile:" + profile); mIsProfileReady = false; } } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java index 75d16db13efe..ca840d9a8ba4 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java @@ -33,7 +33,6 @@ import java.util.List; */ public class HidProfile implements LocalBluetoothProfile { private static final String TAG = "HidProfile"; - private static boolean V = true; private BluetoothHidHost mService; private boolean mIsProfileReady; @@ -51,7 +50,6 @@ public class HidProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - if (V) Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothHidHost) proxy; // We just bound to the service, so refresh the UI for any connected HID devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -70,7 +68,6 @@ public class HidProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - if (V) Log.d(TAG,"Bluetooth service disconnected"); mIsProfileReady=false; } } @@ -186,7 +183,7 @@ public class HidProfile implements LocalBluetoothProfile { } protected void finalize() { - if (V) Log.d(TAG, "finalize()"); + Log.d(TAG, "finalize()"); if (mService != null) { try { BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HID_HOST, diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java index 1e22f440b5f8..6acdcac86d92 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java @@ -59,7 +59,6 @@ public final class MapClientProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG, "Bluetooth service connected, profile:" + profile); mService = (BluetoothMapClient) proxy; // We just bound to the service, so refresh the UI for any connected MAP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -81,7 +80,6 @@ public final class MapClientProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - Log.d(TAG, "Bluetooth service disconnected, profile:" + profile); mProfileManager.callServiceDisconnectedListeners(); mIsProfileReady=false; } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java index 758202412c93..28975d4b94c2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java @@ -58,7 +58,6 @@ public class MapProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG, "Bluetooth service connected"); mService = (BluetoothMap) proxy; // We just bound to the service, so refresh the UI for any connected MAP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -80,7 +79,6 @@ public class MapProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - Log.d(TAG, "Bluetooth service disconnected"); mProfileManager.callServiceDisconnectedListeners(); mIsProfileReady=false; } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PanProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PanProfile.java index 7b811624a6f3..2d0a0902de24 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PanProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PanProfile.java @@ -34,7 +34,6 @@ import java.util.List; */ public class PanProfile implements LocalBluetoothProfile { private static final String TAG = "PanProfile"; - private static boolean V = true; private BluetoothPan mService; private boolean mIsProfileReady; @@ -53,13 +52,11 @@ public class PanProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - if (V) Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothPan) proxy; mIsProfileReady=true; } public void onServiceDisconnected(int profile) { - if (V) Log.d(TAG,"Bluetooth service disconnected"); mIsProfileReady=false; } } @@ -173,7 +170,7 @@ public class PanProfile implements LocalBluetoothProfile { } protected void finalize() { - if (V) Log.d(TAG, "finalize()"); + Log.d(TAG, "finalize()"); if (mService != null) { try { BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.PAN, mService); diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java index 1f15601f2756..46723937a941 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java @@ -55,7 +55,6 @@ public final class PbapClientProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG, "Bluetooth service connected, profile:" + profile); mService = (BluetoothPbapClient) proxy; // We just bound to the service, so refresh the UI for any connected PBAP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -74,7 +73,6 @@ public final class PbapClientProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - Log.d(TAG, "Bluetooth service disconnected, profile:" + profile); mIsProfileReady = false; } } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java index adef0841cb2a..1b3c453be4ed 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java @@ -33,7 +33,6 @@ import com.android.settingslib.R; */ public class PbapServerProfile implements LocalBluetoothProfile { private static final String TAG = "PbapServerProfile"; - private static boolean V = true; private BluetoothPbap mService; private boolean mIsProfileReady; @@ -56,13 +55,11 @@ public class PbapServerProfile implements LocalBluetoothProfile { implements BluetoothPbap.ServiceListener { public void onServiceConnected(BluetoothPbap proxy) { - if (V) Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothPbap) proxy; mIsProfileReady=true; } public void onServiceDisconnected() { - if (V) Log.d(TAG,"Bluetooth service disconnected"); mIsProfileReady=false; } } @@ -142,7 +139,7 @@ public class PbapServerProfile implements LocalBluetoothProfile { } protected void finalize() { - if (V) Log.d(TAG, "finalize()"); + Log.d(TAG, "finalize()"); if (mService != null) { try { mService.close(); diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java index b4acc4810faf..ea2ebde3ff4c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java @@ -57,7 +57,6 @@ final class SapProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - Log.d(TAG, "Bluetooth service connected, profile:" + profile); mService = (BluetoothSap) proxy; // We just bound to the service, so refresh the UI for any connected SAP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -79,7 +78,6 @@ final class SapProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - Log.d(TAG, "Bluetooth service disconnected, profile:" + profile); mProfileManager.callServiceDisconnectedListeners(); mIsProfileReady=false; } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartInfoTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartInfoTest.java new file mode 100644 index 000000000000..29d57b7bbeef --- /dev/null +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartInfoTest.java @@ -0,0 +1,129 @@ +/* + * 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.widget; + +import static com.google.common.truth.Truth.assertThat; + +import android.view.View; + +import androidx.annotation.StringRes; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +@RunWith(RobolectricTestRunner.class) +public class BarChartInfoTest { + + @Rule + public final ExpectedException thrown = ExpectedException.none(); + @StringRes + private final int mTitle = 0x11111111; + @StringRes + private final int mDetails = 0x22222222; + @StringRes + private final int mEmptyText = 0x33333333; + private final View.OnClickListener mClickListener = v -> { + }; + + @Test + public void builder_shouldSetFieldsInTheInfo() { + final BarChartInfo barChartInfo = new BarChartInfo.Builder() + .setTitle(mTitle) + .setDetails(mDetails) + .setEmptyText(mEmptyText) + .setDetailsOnClickListener(mClickListener) + .build(); + assertThat(barChartInfo.getTitle()).isEqualTo(mTitle); + assertThat(barChartInfo.getDetails()).isEqualTo(mDetails); + assertThat(barChartInfo.getEmptyText()).isEqualTo(mEmptyText); + assertThat(barChartInfo.getDetailsOnClickListener()).isEqualTo(mClickListener); + } + + @Test + public void builder_noTitle_shouldThrowIllegalStateException() { + thrown.expect(IllegalStateException.class); + + new BarChartInfo.Builder() + .setDetails(mDetails) + .setEmptyText(mEmptyText) + .setDetailsOnClickListener(mClickListener) + .build(); + } + + @Test + public void addBarViewInfo_oneBarViewInfo_shouldSetOneBarViewInfo() { + final BarViewInfo barViewInfo = new BarViewInfo( + null /* icon */, + 50, + mTitle); + + final BarChartInfo mBarChartInfo = new BarChartInfo.Builder() + .setTitle(mTitle) + .setDetails(mDetails) + .setEmptyText(mEmptyText) + .setDetailsOnClickListener(mClickListener) + .addBarViewInfo(barViewInfo) + .build(); + + assertThat(mBarChartInfo.getBarViewInfos().length).isEqualTo(1); + assertThat(mBarChartInfo.getBarViewInfos()[0]).isEqualTo(barViewInfo); + } + + @Test + public void addBarViewInfo_maxNumberOfInfoAllowed_shouldSetMaxBarViewInfos() { + final BarViewInfo barViewInfo = new BarViewInfo( + null /* icon */, + 50, + mTitle); + final BarChartInfo mBarChartInfo = new BarChartInfo.Builder() + .setTitle(mTitle) + .setDetails(mDetails) + .setEmptyText(mEmptyText) + .setDetailsOnClickListener(mClickListener) + .addBarViewInfo(barViewInfo) + .addBarViewInfo(barViewInfo) + .addBarViewInfo(barViewInfo) + .addBarViewInfo(barViewInfo) + .build(); + + assertThat(mBarChartInfo.getBarViewInfos().length).isEqualTo(4); + } + + @Test + public void addBarViewInfo_moreInfosThanMaxAllowed_shouldThrowIllegalStateException() { + thrown.expect(IllegalStateException.class); + + final BarViewInfo barViewInfo = new BarViewInfo( + null /* icon */, + 50, + mTitle); + new BarChartInfo.Builder() + .setTitle(mTitle) + .setDetails(mDetails) + .setEmptyText(mEmptyText) + .setDetailsOnClickListener(mClickListener) + .addBarViewInfo(barViewInfo) + .addBarViewInfo(barViewInfo) + .addBarViewInfo(barViewInfo) + .addBarViewInfo(barViewInfo) + .addBarViewInfo(barViewInfo) + .build(); + } +} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java index 96e8995579f7..cf6137d47bb0 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2019 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,9 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @@ -34,6 +36,9 @@ import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) public class BarChartPreferenceTest { + @Rule + public final ExpectedException thrown = ExpectedException.none(); + private Context mContext; private View mBarChartView; private Drawable mIcon; @@ -44,6 +49,7 @@ public class BarChartPreferenceTest { private TextView mDetailsView; private PreferenceViewHolder mHolder; private BarChartPreference mPreference; + private BarChartInfo mBarChartInfo; @Before public void setUp() { @@ -51,21 +57,31 @@ public class BarChartPreferenceTest { mBarChartView = View.inflate(mContext, R.layout.settings_bar_chart, null /* parent */); mHolder = PreferenceViewHolder.createInstanceForTests(mBarChartView); mPreference = new BarChartPreference(mContext, null /* attrs */); - mPreference.setBarChartTitle(R.string.debug_app); mIcon = mContext.getDrawable(R.drawable.ic_menu); - mBarView1 = (BarView) mBarChartView.findViewById(R.id.bar_view1); - mBarView2 = (BarView) mBarChartView.findViewById(R.id.bar_view2); - mBarView3 = (BarView) mBarChartView.findViewById(R.id.bar_view3); - mBarView4 = (BarView) mBarChartView.findViewById(R.id.bar_view4); - mDetailsView = (TextView) mBarChartView.findViewById(R.id.bar_chart_details); + mBarView1 = mBarChartView.findViewById(R.id.bar_view1); + mBarView2 = mBarChartView.findViewById(R.id.bar_view2); + mBarView3 = mBarChartView.findViewById(R.id.bar_view3); + mBarView4 = mBarChartView.findViewById(R.id.bar_view4); + mDetailsView = mBarChartView.findViewById(R.id.bar_chart_details); + + mBarChartInfo = new BarChartInfo.Builder() + .setTitle(R.string.debug_app) + .setDetails(R.string.debug_app) + .setEmptyText(R.string.debug_app) + .setDetailsOnClickListener(v -> { + }) + .build(); } @Test - public void setBarChartTitleRes_setTitleRes_showInBarChartTitle() { - final TextView titleView = (TextView) mBarChartView.findViewById(R.id.bar_chart_title); + public void initializeBarChart_titleSet_shouldSetTitleInChartView() { + final TextView titleView = mBarChartView.findViewById(R.id.bar_chart_title); + final BarChartInfo barChartInfo = new BarChartInfo.Builder() + .setTitle(R.string.debug_app) + .build(); - mPreference.setBarChartTitle(R.string.debug_app); + mPreference.initializeBarChart(barChartInfo); mPreference.onBindViewHolder(mHolder); assertThat(titleView.getVisibility()).isEqualTo(View.VISIBLE); @@ -73,21 +89,33 @@ public class BarChartPreferenceTest { } @Test - public void onBindViewHolder_notSetDetailsRes_barChartDetailsViewIsGone() { - // We don't call BarChartPreference#setBarChartDetails + public void initializeBarChart_noBarViewSet_shouldShowTitleAndEmptyView() { + final BarChartInfo barChartInfo = new BarChartInfo.Builder() + .setTitle(R.string.debug_app) + .setEmptyText(R.string.debug_app) + .build(); + + mPreference.initializeBarChart(barChartInfo); + // We don't add any bar view yet. mPreference.onBindViewHolder(mHolder); - assertThat(mDetailsView.getVisibility()).isEqualTo(View.GONE); + assertThat(mBarChartView.findViewById(R.id.bar_chart_title).getVisibility()) + .isEqualTo(View.VISIBLE); + assertThat(mBarChartView.findViewById(R.id.empty_view).getVisibility()) + .isEqualTo(View.VISIBLE); + assertThat(mBarChartView.findViewById(R.id.bar_views_container).getVisibility()) + .isEqualTo(View.GONE); } @Test - public void onBindViewHolder_notSetDetailsRes_barChartDetailsViewIsGoneThenReappears() { - // We don't call BarChartPreference#setBarChartDetails yet. - mPreference.onBindViewHolder(mHolder); - - assertThat(mDetailsView.getVisibility()).isEqualTo(View.GONE); - - mPreference.setBarChartDetails(R.string.debug_app); + public void initializeBarChart_detailsSet_shouldShowBarChartDetailsView() { + final BarChartInfo barChartInfo = new BarChartInfo.Builder() + .setTitle(R.string.debug_app) + .setDetails(R.string.debug_app) + .addBarViewInfo(new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app)) + .build(); + + mPreference.initializeBarChart(barChartInfo); mPreference.onBindViewHolder(mHolder); assertThat(mDetailsView.getVisibility()).isEqualTo(View.VISIBLE); @@ -95,19 +123,30 @@ public class BarChartPreferenceTest { } @Test - public void setBarChartDetailsRes_setDetailsRes_showInBarChartDetails() { - mPreference.setBarChartDetails(R.string.debug_app); + public void initializeBarChart_detailsNotSet_shouldHideBarChartDetailsView() { + // We don't call BarChartInfo.Builder#setDetails yet. + final BarChartInfo barChartInfo = new BarChartInfo.Builder() + .setTitle(R.string.debug_app) + .addBarViewInfo(new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app)) + .build(); + + mPreference.initializeBarChart(barChartInfo); mPreference.onBindViewHolder(mHolder); - assertThat(mDetailsView.getVisibility()).isEqualTo(View.VISIBLE); - assertThat(mDetailsView.getText()).isEqualTo(mContext.getText(R.string.debug_app)); + assertThat(mDetailsView.getVisibility()).isEqualTo(View.GONE); } @Test - public void setBarChartDetailsClickListener_setClickListener_detailsViewAttachClickListener() { - mPreference.setBarChartDetails(R.string.debug_app); - mPreference.setBarChartDetailsClickListener(v -> { - }); + public void initializeBarChart_clickListenerSet_shouldSetClickListenerOnDetailsView() { + final BarChartInfo barChartInfo = new BarChartInfo.Builder() + .setTitle(R.string.debug_app) + .setDetails(R.string.debug_app) + .setDetailsOnClickListener(v -> { + }) + .addBarViewInfo(new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app)) + .build(); + + mPreference.initializeBarChart(barChartInfo); mPreference.onBindViewHolder(mHolder); assertThat(mDetailsView.getVisibility()).isEqualTo(View.VISIBLE); @@ -115,12 +154,13 @@ public class BarChartPreferenceTest { } @Test - public void setAllBarViewsInfo_setOneBarViewInfo_showOneBarView() { + public void setBarViewInfos_oneBarViewInfoSet_shouldShowOneBarView() { final BarViewInfo[] barViewsInfo = new BarViewInfo[]{ new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app) }; - mPreference.setAllBarViewsInfo(barViewsInfo); + mPreference.initializeBarChart(mBarChartInfo); + mPreference.setBarViewInfos(barViewsInfo); mPreference.onBindViewHolder(mHolder); assertThat(mBarView1.getVisibility()).isEqualTo(View.VISIBLE); @@ -132,13 +172,14 @@ public class BarChartPreferenceTest { } @Test - public void setAllBarViewsInfo_setTwoBarViewsInfo_showTwoBarViews() { + public void setBarViewInfos_twoBarViewInfosSet_shouldShowTwoBarViews() { final BarViewInfo[] barViewsInfo = new BarViewInfo[]{ new BarViewInfo(mIcon, 20 /* barNumber */, R.string.debug_app), new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app) }; - mPreference.setAllBarViewsInfo(barViewsInfo); + mPreference.initializeBarChart(mBarChartInfo); + mPreference.setBarViewInfos(barViewsInfo); mPreference.onBindViewHolder(mHolder); assertThat(mBarView1.getVisibility()).isEqualTo(View.VISIBLE); @@ -151,14 +192,15 @@ public class BarChartPreferenceTest { } @Test - public void setAllBarViewsInfo_setThreeBarViewsInfo_showThreeBarViews() { + public void setBarViewInfos_threeBarViewInfosSet_shouldShowThreeBarViews() { final BarViewInfo[] barViewsInfo = new BarViewInfo[]{ new BarViewInfo(mIcon, 20 /* barNumber */, R.string.debug_app), new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app), new BarViewInfo(mIcon, 5 /* barNumber */, R.string.debug_app) }; - mPreference.setAllBarViewsInfo(barViewsInfo); + mPreference.initializeBarChart(mBarChartInfo); + mPreference.setBarViewInfos(barViewsInfo); mPreference.onBindViewHolder(mHolder); assertThat(mBarView1.getVisibility()).isEqualTo(View.VISIBLE); @@ -172,7 +214,7 @@ public class BarChartPreferenceTest { } @Test - public void setAllBarViewsInfo_setFourBarViewsInfo_showFourBarViews() { + public void setBarViewInfos_fourBarViewInfosSet_shouldShowFourBarViews() { final BarViewInfo[] barViewsInfo = new BarViewInfo[]{ new BarViewInfo(mIcon, 20 /* barNumber */, R.string.debug_app), new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app), @@ -180,7 +222,8 @@ public class BarChartPreferenceTest { new BarViewInfo(mIcon, 2 /* barNumber */, R.string.debug_app), }; - mPreference.setAllBarViewsInfo(barViewsInfo); + mPreference.initializeBarChart(mBarChartInfo); + mPreference.setBarViewInfos(barViewsInfo); mPreference.onBindViewHolder(mHolder); assertThat(mBarView1.getVisibility()).isEqualTo(View.VISIBLE); @@ -194,7 +237,22 @@ public class BarChartPreferenceTest { } @Test - public void setAllBarViewsInfo_setFourBarViewsInfo_barViewWasSortedInDescending() { + public void setBarViewInfos_moreInfosThanMaxAllowed_shouldThrowIllegalStateException() { + thrown.expect(IllegalStateException.class); + + final BarViewInfo[] barViewsInfo = new BarViewInfo[]{ + new BarViewInfo(mIcon, 30 /* barNumber */, R.string.debug_app), + new BarViewInfo(mIcon, 50 /* barNumber */, R.string.debug_app), + new BarViewInfo(mIcon, 5 /* barNumber */, R.string.debug_app), + new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app), + new BarViewInfo(mIcon, 70 /* barNumber */, R.string.debug_app), + }; + + mPreference.setBarViewInfos(barViewsInfo); + } + + @Test + public void setBarViewInfos_barViewInfosSet_shouldBeSortedInDescending() { final BarViewInfo[] barViewsInfo = new BarViewInfo[]{ new BarViewInfo(mIcon, 30 /* barNumber */, R.string.debug_app), new BarViewInfo(mIcon, 50 /* barNumber */, R.string.debug_app), @@ -202,7 +260,8 @@ public class BarChartPreferenceTest { new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app), }; - mPreference.setAllBarViewsInfo(barViewsInfo); + mPreference.initializeBarChart(mBarChartInfo); + mPreference.setBarViewInfos(barViewsInfo); mPreference.onBindViewHolder(mHolder); assertThat(mBarView1.getVisibility()).isEqualTo(View.VISIBLE); @@ -216,12 +275,13 @@ public class BarChartPreferenceTest { } @Test - public void setAllBarViewsInfo_setValidSummaryRes_barViewShouldShowSummary() { + public void setBarViewInfos_validBarViewSummarySet_barViewShouldShowSummary() { final BarViewInfo[] barViewsInfo = new BarViewInfo[]{ new BarViewInfo(mIcon, 10 /* barNumber */, R.string.debug_app), }; - mPreference.setAllBarViewsInfo(barViewsInfo); + mPreference.initializeBarChart(mBarChartInfo); + mPreference.setBarViewInfos(barViewsInfo); mPreference.onBindViewHolder(mHolder); assertThat(mBarView1.getVisibility()).isEqualTo(View.VISIBLE); @@ -229,13 +289,14 @@ public class BarChartPreferenceTest { } @Test - public void setAllBarViewsInfo_setClickListenerForBarView_barViewAttachClickListener() { + public void setBarViewInfos_clickListenerForBarViewSet_barViewShouldHaveClickListener() { final BarViewInfo viewInfo = new BarViewInfo(mIcon, 30 /* barNumber */, R.string.debug_app); viewInfo.setClickListener(v -> { }); final BarViewInfo[] barViewsInfo = new BarViewInfo[]{viewInfo}; - mPreference.setAllBarViewsInfo(barViewsInfo); + mPreference.initializeBarChart(mBarChartInfo); + mPreference.setBarViewInfos(barViewsInfo); mPreference.onBindViewHolder(mHolder); assertThat(mBarView1.getVisibility()).isEqualTo(View.VISIBLE); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java index f2b2719f2ee6..d0ffe7ae8c7e 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java @@ -242,7 +242,7 @@ public final class DeviceConfigService extends Binder { Bundle args = new Bundle(); args.putInt(Settings.CALL_METHOD_USER_KEY, ActivityManager.getService().getCurrentUser().id); - Bundle b = provider.call(resolveCallingPackage(), + Bundle b = provider.call(resolveCallingPackage(), Settings.AUTHORITY, Settings.CALL_METHOD_DELETE_CONFIG, compositeKey, args); success = (b != null && b.getInt(SettingsProvider.RESULT_ROWS_DELETED) == 1); } catch (RemoteException e) { @@ -261,7 +261,7 @@ public final class DeviceConfigService extends Binder { if (namespace != null) { args.putString(Settings.CALL_METHOD_PREFIX_KEY, namespace); } - Bundle b = provider.call(resolveCallingPackage(), + Bundle b = provider.call(resolveCallingPackage(), Settings.AUTHORITY, Settings.CALL_METHOD_LIST_CONFIG, null, args); if (b != null) { Map<String, String> flagsToValues = diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index e3d3d81704a8..526efcb35262 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -705,8 +705,11 @@ class SettingsProtoDumpUtil { Settings.Global.GPU_DEBUG_LAYERS_GLES, GlobalSettingsProto.Gpu.DEBUG_LAYERS_GLES); dumpSetting(s, p, - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, - GlobalSettingsProto.Gpu.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); + Settings.Global.GUP_DEV_OPT_IN_APPS, + GlobalSettingsProto.Gpu.GUP_DEV_OPT_IN_APPS); + dumpSetting(s, p, + Settings.Global.GUP_BLACK_LIST, + GlobalSettingsProto.Gpu.GUP_BLACK_LIST); p.end(gpuToken); final long hdmiToken = p.start(GlobalSettingsProto.HDMI); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index ce529a085e77..bce559396ddd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1097,7 +1097,7 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_INSERT: { return mSettingsRegistry.insertSettingLocked(SETTINGS_TYPE_CONFIG, UserHandle.USER_SYSTEM, name, value, null, makeDefault, true, - getCallingPackage(), false, null); + resolveCallingPackage(), false, null); } case MUTATION_OPERATION_DELETE: { @@ -1107,7 +1107,7 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_RESET: { mSettingsRegistry.resetSettingsLocked(SETTINGS_TYPE_CONFIG, - UserHandle.USER_SYSTEM, getCallingPackage(), mode, null, prefix); + UserHandle.USER_SYSTEM, resolveCallingPackage(), mode, null, prefix); } return true; } } @@ -2247,6 +2247,22 @@ public class SettingsProvider extends ContentProvider { return !(TextUtils.isEmpty(key) || SettingsState.isBinary(key)); } + private String resolveCallingPackage() { + switch (Binder.getCallingUid()) { + case Process.ROOT_UID: { + return "root"; + } + + case Process.SHELL_UID: { + return "com.android.shell"; + } + + default: { + return getCallingPackage(); + } + } + } + private static final class Arguments { private static final Pattern WHERE_PATTERN_WITH_PARAM_NO_BRACKETS = Pattern.compile("[\\s]*name[\\s]*=[\\s]*\\?[\\s]*"); @@ -4125,10 +4141,12 @@ public class SettingsProvider extends ContentProvider { Secure.CHARGING_SOUNDS_ENABLED); if (!globalChargingSoundEnabled.isNull()) { - secureSettings.insertSettingLocked( - Secure.CHARGING_SOUNDS_ENABLED, - globalChargingSoundEnabled.getValue(), null, false, - SettingsState.SYSTEM_PACKAGE_NAME); + if (secureChargingSoundsEnabled.isNull()) { + secureSettings.insertSettingLocked( + Secure.CHARGING_SOUNDS_ENABLED, + globalChargingSoundEnabled.getValue(), null, false, + SettingsState.SYSTEM_PACKAGE_NAME); + } // set global charging_sounds_enabled setting to null since it's deprecated globalSettings.insertSettingLocked( diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 8cfc2a6b158d..bff2c844bb48 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -82,6 +82,7 @@ <uses-permission android:name="android.permission.CLEAR_APP_CACHE" /> <uses-permission android:name="android.permission.DELETE_CACHE_FILES" /> <uses-permission android:name="android.permission.DELETE_PACKAGES" /> + <uses-permission android:name="android.permission.MANAGE_ROLLBACKS" /> <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" /> <uses-permission android:name="android.permission.READ_FRAME_BUFFER" /> <uses-permission android:name="android.permission.DEVICE_POWER" /> diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java index 4891e5006279..5317a6df53e8 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java @@ -32,10 +32,11 @@ public interface ActivityStarter { void startPendingIntentDismissingKeyguard(PendingIntent intent); /** - * Similar to {@link #startPendingIntentDismissingKeyguard(PendingIntent, Runnable)}, but - * allow you to specify the callback that is executed after the intent is sent. + * Similar to {@link #startPendingIntentDismissingKeyguard(PendingIntent, Runnable)}, but allows + * you to specify the callback that is executed on the UI thread after the intent is sent. */ - void startPendingIntentDismissingKeyguard(PendingIntent intent, Runnable intentSentCallback); + void startPendingIntentDismissingKeyguard(PendingIntent intent, + Runnable intentSentUiThreadCallback); void startActivity(Intent intent, boolean dismissShade); void startActivity(Intent intent, boolean onlyProvisioned, boolean dismissShade); void startActivity(Intent intent, boolean dismissShade, Callback callback); diff --git a/packages/SystemUI/res/drawable/face_dialog_error_to_face.xml b/packages/SystemUI/res/drawable/face_dialog_error_to_face.xml new file mode 100644 index 000000000000..75311f44dfe3 --- /dev/null +++ b/packages/SystemUI/res/drawable/face_dialog_error_to_face.xml @@ -0,0 +1,517 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector + android:width="60dp" + android:height="60dp" + android:viewportWidth="60" + android:viewportHeight="60"> + <group android:name="_R_G"> + <group + android:name="_R_G_L_0_G_N_1_T_0" + android:translateX="30" + android:translateY="30"> + <group + android:name="_R_G_L_0_G" + android:translateX="-30" + android:translateY="-30"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c " + android:strokeWidth="2.5" + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorError" + android:trimPathStart="0" + android:trimPathEnd="1" + android:trimPathOffset="0" /> + <path + android:name="_R_G_L_0_G_D_1_P_0" + android:pathData=" M34.78 38.76 C33.83,38.75 31.54,38.75 30.01,38.75 C26.97,38.75 26.14,38.75 24.3,38.76 " + android:strokeWidth="2.5" + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorError" + android:trimPathStart="0.34" + android:trimPathEnd="0.5700000000000001" + android:trimPathOffset="0" /> + <group + android:name="_R_G_L_0_G_D_2_P_0_G_0_T_0" + android:scaleX="0.3" + android:scaleY="0.3" + android:translateX="37.788" + android:translateY="19.53"> + <path + android:name="_R_G_L_0_G_D_2_P_0" + android:fillAlpha="0" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.1,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0" + android:scaleX="0.3" + android:scaleY="0.3" + android:translateX="22.005" + android:translateY="19.51"> + <path + android:name="_R_G_L_0_G_D_3_P_0" + android:fillAlpha="0" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.2,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0" + android:translateX="30.3" + android:translateY="29.215"> + <path + android:name="_R_G_L_0_G_D_4_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorError" + android:fillType="nonZero" + android:pathData=" M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-11.71 -1.5,-11.71 C-1.5,-11.71 0.9,-11.71 0.9,-11.71 C0.9,-11.71 0.9,3.25 0.9,3.25c " /> + </group> + </group> + </group> + </group> + <group android:name="time_group" /> + </vector> + </aapt:attr> + <target android:name="_R_G_L_0_G_D_0_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="?android:attr/colorError" + android:valueTo="?android:attr/colorError" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="strokeColor" + android:startOffset="83" + android:valueFrom="?android:attr/colorError" + android:valueTo="@color/biometric_face_icon_gray" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="?android:attr/colorError" + android:valueTo="?android:attr/colorError" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="strokeColor" + android:startOffset="83" + android:valueFrom="?android:attr/colorError" + android:valueTo="@color/biometric_face_icon_gray" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="strokeWidth" + android:startOffset="0" + android:valueFrom="2.5" + android:valueTo="2" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="pathData" + android:startOffset="0" + android:valueFrom="M34.78 38.76 C33.83,38.75 31.54,38.75 30.01,38.75 C26.97,38.75 26.14,38.75 24.3,38.76 " + android:valueTo="M33.75 42.75 C32.75,43.76 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 " + android:valueType="pathType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="trimPathStart" + android:startOffset="0" + android:valueFrom="0.34" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="0.5700000000000001" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="fillAlpha" + android:startOffset="83" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:pathData="M 37.788,19.53C 38.3400184636116,20.241653709411622 37.235981536388394,18.81834629058838 37.788,19.53" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:pathData="M 37.788,19.53C 38.3400184636116,20.241653709411622 40.5479815363884,23.08834629058838 41.1,23.8" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="50"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="0.3" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="50" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="0.3" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="117" + android:propertyName="scaleX" + android:startOffset="50" + android:valueFrom="0.3" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="117" + android:propertyName="scaleY" + android:startOffset="50" + android:valueFrom="0.3" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="fillAlpha" + android:startOffset="83" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:pathData="M 22.005,19.51C 21.43742198228836,20.224974105358122 22.57257801771164,18.79502589464188 22.005,19.51" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:pathData="M 22.005,19.51C 21.43742198228836,20.224974105358122 19.16757801771164,23.08502589464188 18.6,23.8" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="50"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="0.3" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="50" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="0.3" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="117" + android:propertyName="scaleX" + android:startOffset="50" + android:valueFrom="0.3" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="117" + android:propertyName="scaleY" + android:startOffset="50" + android:valueFrom="0.3" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="fillColor" + android:startOffset="0" + android:valueFrom="?android:attr/colorError" + android:valueTo="?android:attr/colorError" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="fillColor" + android:startOffset="83" + android:valueFrom="?android:attr/colorError" + android:valueTo="@color/biometric_face_icon_gray" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="150" + android:pathData="M 30.3,29.215C 30.3,29.58759101867676 30.3,31.077408981323238 30.3,31.45" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="pathData" + android:startOffset="0" + android:valueFrom="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-11.71 -1.5,-11.71 C-1.5,-11.71 0.9,-11.71 0.9,-11.71 C0.9,-11.71 0.9,3.25 0.9,3.25c " + android:valueTo="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-3.25 -1.5,-3.25 C-1.5,-3.25 0.9,-3.25 0.9,-3.25 C0.9,-3.25 0.9,3.25 0.9,3.25c " + android:valueType="pathType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.321,0 0.67,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="133" + android:propertyName="pathData" + android:startOffset="83" + android:valueFrom="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-3.25 -1.5,-3.25 C-1.5,-3.25 0.9,-3.25 0.9,-3.25 C0.9,-3.25 0.9,3.25 0.9,3.25c " + android:valueTo="M2.6 3.25 C2.6,3.25 -2.6,3.25 -2.6,3.25 C-2.6,3.25 -2.6,1.25 -2.6,1.25 C-2.6,1.25 0.6,1.25 0.6,1.25 C0.6,1.25 0.6,-3.25 0.6,-3.25 C0.6,-3.25 2.6,-3.25 2.6,-3.25 C2.6,-3.25 2.6,3.25 2.6,3.25c " + android:valueType="pathType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.568,0 0.456,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="time_group"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="233" + android:propertyName="translateX" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/face_dialog_face_blue_to_checkmark.xml b/packages/SystemUI/res/drawable/face_dialog_face_blue_to_checkmark.xml new file mode 100644 index 000000000000..e4ace67577c3 --- /dev/null +++ b/packages/SystemUI/res/drawable/face_dialog_face_blue_to_checkmark.xml @@ -0,0 +1,637 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector + android:width="60dp" + android:height="60dp" + android:viewportWidth="60" + android:viewportHeight="60"> + <group android:name="_R_G"> + <group + android:name="_R_G_L_0_G_N_2_T_0" + android:translateX="30" + android:translateY="30"> + <group + android:name="_R_G_L_0_G" + android:translateX="-30" + android:translateY="-30"> + <group + android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" + android:scaleX="0.08" + android:scaleY="0.08" + android:translateX="30.1" + android:translateY="30.083"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:fillAlpha="0" + android:fillColor="?android:attr/colorAccent" + android:fillType="nonZero" + android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 " + android:trimPathStart="0" + android:trimPathEnd="0" + android:trimPathOffset="0" /> + </group> + <group + android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0" + android:scaleX="0.08" + android:scaleY="0.08" + android:translateX="30.1" + android:translateY="30.083"> + <path + android:name="_R_G_L_0_G_D_1_P_0" + android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 " + android:strokeWidth="20" + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:trimPathStart="0" + android:trimPathEnd="0" + android:trimPathOffset="0" /> + </group> + <path + android:name="_R_G_L_0_G_D_2_P_0" + android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c " + android:strokeWidth="2.5" + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:trimPathStart="0" + android:trimPathEnd="1" + android:trimPathOffset="0" /> + <group + android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0" + android:pivotX="1.05" + android:pivotY="-9.891" + android:scaleX="1" + android:scaleY="1" + android:translateX="29.044" + android:translateY="41.647"> + <path + android:name="_R_G_L_0_G_D_3_P_0" + android:pathData=" M4.71 1.1 C3.71,2.12 2.32,2.75 0.79,2.75 C-2.25,2.75 -4.7,0.29 -4.7,-2.75 " + android:strokeWidth="2" + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:trimPathStart="0" + android:trimPathEnd="1" + android:trimPathOffset="0" /> + </group> + <group + android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="41.1" + android:translateY="23.8"> + <path + android:name="_R_G_L_0_G_D_4_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorAccent" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.1,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_5_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="18.6" + android:translateY="23.8"> + <path + android:name="_R_G_L_0_G_D_5_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorAccent" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.2,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_6_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="30.727" + android:translateY="31.703"> + <path + android:name="_R_G_L_0_G_D_6_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorAccent" + android:fillType="nonZero" + android:pathData=" M2.6 3.25 C2.6,3.25 -2.6,3.25 -2.6,3.25 C-2.6,3.25 -2.6,1.25 -2.6,1.25 C-2.6,1.25 0.6,1.25 0.6,1.25 C0.6,1.25 0.6,-3.25 0.6,-3.25 C0.6,-3.25 2.6,-3.25 2.6,-3.25 C2.6,-3.25 2.6,3.25 2.6,3.25c " /> + </group> + </group> + </group> + </group> + <group android:name="time_group" /> + </vector> + </aapt:attr> + <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="33" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleX" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleY" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleX" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleY" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_0_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="233" + android:propertyName="trimPathEnd" + android:startOffset="33" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="33" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleX" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleY" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleX" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleY" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="233" + android:propertyName="trimPathEnd" + android:startOffset="33" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="?android:attr/colorAccent" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="strokeColor" + android:startOffset="67" + android:valueFrom="?android:attr/colorAccent" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="strokeAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.65" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.65" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="trimPathStart" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0.5" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.5" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="83" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_5_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_5_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="83" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_6_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_6_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.287,0.12 0.667,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="83" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.287,0.12 0.667,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="time_group"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="383" + android:propertyName="translateX" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/face_dialog_face_gray_to_checkmark.xml b/packages/SystemUI/res/drawable/face_dialog_face_gray_to_checkmark.xml new file mode 100644 index 000000000000..b09f69b742bb --- /dev/null +++ b/packages/SystemUI/res/drawable/face_dialog_face_gray_to_checkmark.xml @@ -0,0 +1,637 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector + android:width="60dp" + android:height="60dp" + android:viewportWidth="60" + android:viewportHeight="60"> + <group android:name="_R_G"> + <group + android:name="_R_G_L_0_G_N_2_T_0" + android:translateX="30" + android:translateY="30"> + <group + android:name="_R_G_L_0_G" + android:translateX="-30" + android:translateY="-30"> + <group + android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" + android:scaleX="0.08" + android:scaleY="0.08" + android:translateX="30.1" + android:translateY="30.083"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:fillAlpha="0" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 " + android:trimPathStart="0" + android:trimPathEnd="0" + android:trimPathOffset="0" /> + </group> + <group + android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0" + android:scaleX="0.08" + android:scaleY="0.08" + android:translateX="30.1" + android:translateY="30.083"> + <path + android:name="_R_G_L_0_G_D_1_P_0" + android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 " + android:strokeWidth="20" + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:trimPathStart="0" + android:trimPathEnd="0" + android:trimPathOffset="0" /> + </group> + <path + android:name="_R_G_L_0_G_D_2_P_0" + android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c " + android:strokeWidth="2.5" + android:strokeAlpha="1" + android:strokeColor="@color/biometric_face_icon_gray" + android:trimPathStart="0" + android:trimPathEnd="1" + android:trimPathOffset="0" /> + <group + android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0" + android:pivotX="1.05" + android:pivotY="-9.891" + android:scaleX="1" + android:scaleY="1" + android:translateX="29.044" + android:translateY="41.647"> + <path + android:name="_R_G_L_0_G_D_3_P_0" + android:pathData=" M4.71 1.1 C3.71,2.12 2.32,2.75 0.79,2.75 C-2.25,2.75 -4.7,0.29 -4.7,-2.75 " + android:strokeWidth="2" + android:strokeAlpha="1" + android:strokeColor="@color/biometric_face_icon_gray" + android:trimPathStart="0" + android:trimPathEnd="1" + android:trimPathOffset="0" /> + </group> + <group + android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="41.1" + android:translateY="23.8"> + <path + android:name="_R_G_L_0_G_D_4_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.1,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_5_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="18.6" + android:translateY="23.8"> + <path + android:name="_R_G_L_0_G_D_5_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.2,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_6_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="30.727" + android:translateY="31.703"> + <path + android:name="_R_G_L_0_G_D_6_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M2.6 3.25 C2.6,3.25 -2.6,3.25 -2.6,3.25 C-2.6,3.25 -2.6,1.25 -2.6,1.25 C-2.6,1.25 0.6,1.25 0.6,1.25 C0.6,1.25 0.6,-3.25 0.6,-3.25 C0.6,-3.25 2.6,-3.25 2.6,-3.25 C2.6,-3.25 2.6,3.25 2.6,3.25c " /> + </group> + </group> + </group> + </group> + <group android:name="time_group" /> + </vector> + </aapt:attr> + <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="33" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleX" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleY" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleX" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleY" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_0_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="233" + android:propertyName="trimPathEnd" + android:startOffset="33" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="33" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="0.08" + android:valueTo="0.08" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleX" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="167" + android:propertyName="scaleY" + android:startOffset="33" + android:valueFrom="0.08" + android:valueTo="0.12789" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.537,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleX" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="scaleY" + android:startOffset="200" + android:valueFrom="0.12789" + android:valueTo="0.12241" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.441,0 0.533,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="300" + android:valueFrom="0.12241" + android:valueTo="0.125" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.424,0 0.486,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="233" + android:propertyName="trimPathEnd" + android:startOffset="33" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.292,0 0.155,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="@color/biometric_face_icon_gray" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="strokeColor" + android:startOffset="67" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="strokeAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.65" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.65" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="trimPathStart" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0.5" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.5" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="83" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_5_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_5_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="83" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_6_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_6_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="83" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.287,0.12 0.667,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="83" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.287,0.12 0.667,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="time_group"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="383" + android:propertyName="translateX" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/face_dialog_face_gray_to_face_blue.xml b/packages/SystemUI/res/drawable/face_dialog_face_gray_to_face_blue.xml new file mode 100644 index 000000000000..9259dc7bb977 --- /dev/null +++ b/packages/SystemUI/res/drawable/face_dialog_face_gray_to_face_blue.xml @@ -0,0 +1,178 @@ +<?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 + --> + +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector + android:width="60dp" + android:height="60dp" + android:viewportHeight="60" + android:viewportWidth="60"> + <group android:name="_R_G"> + <group + android:name="_R_G_L_0_G_N_1_T_0" + android:translateX="30" + android:translateY="30"> + <group + android:name="_R_G_L_0_G" + android:translateX="-30" + android:translateY="-30"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c " + android:strokeAlpha="1" + android:strokeColor="@color/biometric_face_icon_gray" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="2.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_0_G_D_1_P_0" + android:pathData=" M33.75 42.75 C32.75,43.76 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 " + android:strokeAlpha="1" + android:strokeColor="@color/biometric_face_icon_gray" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="2" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_0_G_D_2_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M39 23.8 C39,25 39.9,25.9 41.1,25.9 C42.2,25.9 43.2,25 43.2,23.8 C43.2,22.6 42.3,21.7 41.1,21.7 C39.9,21.7 39,22.6 39,23.8c " /> + <path + android:name="_R_G_L_0_G_D_3_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M16.5 23.8 C16.5,25 17.4,25.9 18.6,25.9 C19.8,25.9 20.7,25 20.7,23.8 C20.7,22.6 19.8,21.7 18.6,21.7 C17.4,21.7 16.5,22.6 16.5,23.8c " /> + <path + android:name="_R_G_L_0_G_D_4_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M32.9 34.7 C32.9,34.7 27.7,34.7 27.7,34.7 C27.7,34.7 27.7,32.7 27.7,32.7 C27.7,32.7 30.9,32.7 30.9,32.7 C30.9,32.7 30.9,28.2 30.9,28.2 C30.9,28.2 32.9,28.2 32.9,28.2 C32.9,28.2 32.9,34.7 32.9,34.7c " /> + </group> + </group> + </group> + <group android:name="time_group" /> + </vector> + </aapt:attr> + <target android:name="_R_G_L_0_G_D_0_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="fillColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="fillColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="33" + android:propertyName="fillColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorAccent" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="time_group"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="translateX" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/face_dialog_face_to_error.xml b/packages/SystemUI/res/drawable/face_dialog_face_to_error.xml new file mode 100644 index 000000000000..a96d21addb2b --- /dev/null +++ b/packages/SystemUI/res/drawable/face_dialog_face_to_error.xml @@ -0,0 +1,473 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector + android:width="60dp" + android:height="60dp" + android:viewportWidth="60" + android:viewportHeight="60"> + <group android:name="_R_G"> + <group + android:name="_R_G_L_0_G_N_1_T_0" + android:translateX="30" + android:translateY="30"> + <group + android:name="_R_G_L_0_G" + android:translateX="-30" + android:translateY="-30"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c " + android:strokeWidth="2.5" + android:strokeAlpha="1" + android:strokeColor="@color/biometric_face_icon_gray" + android:trimPathStart="0" + android:trimPathEnd="1" + android:trimPathOffset="0" /> + <path + android:name="_R_G_L_0_G_D_1_P_0" + android:pathData=" M33.75 42.75 C32.75,43.76 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 " + android:strokeWidth="2" + android:strokeAlpha="1" + android:strokeColor="@color/biometric_face_icon_gray" + android:trimPathStart="0" + android:trimPathEnd="1" + android:trimPathOffset="0" /> + <group + android:name="_R_G_L_0_G_D_2_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="41.1" + android:translateY="23.8"> + <path + android:name="_R_G_L_0_G_D_2_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.1,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="18.6" + android:translateY="23.8"> + <path + android:name="_R_G_L_0_G_D_3_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.2,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " /> + </group> + <group + android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0" + android:translateX="30.3" + android:translateY="31.45"> + <path + android:name="_R_G_L_0_G_D_4_P_0" + android:fillAlpha="1" + android:fillColor="@color/biometric_face_icon_gray" + android:fillType="nonZero" + android:pathData=" M2.6 3.25 C2.6,3.25 -2.6,3.25 -2.6,3.25 C-2.6,3.25 -2.6,1.25 -2.6,1.25 C-2.6,1.25 0.6,1.25 0.6,1.25 C0.6,1.25 0.6,-3.25 0.6,-3.25 C0.6,-3.25 2.6,-3.25 2.6,-3.25 C2.6,-3.25 2.6,3.25 2.6,3.25c " /> + </group> + </group> + </group> + </group> + <group android:name="time_group" /> + </vector> + </aapt:attr> + <target android:name="_R_G_L_0_G_D_0_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="@color/biometric_face_icon_gray" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="strokeColor" + android:startOffset="50" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorError" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="strokeColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="@color/biometric_face_icon_gray" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="strokeColor" + android:startOffset="50" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorError" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="strokeWidth" + android:startOffset="0" + android:valueFrom="2" + android:valueTo="2.5" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="pathData" + android:startOffset="0" + android:valueFrom="M33.75 42.75 C32.75,43.76 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 " + android:valueTo="M34.78 38.76 C33.83,38.75 31.54,38.75 30.01,38.75 C26.97,38.75 26.14,38.75 24.3,38.76 " + android:valueType="pathType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="trimPathStart" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="0.34" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_1_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="217" + android:propertyName="trimPathEnd" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.5700000000000001" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="fillAlpha" + android:startOffset="50" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:pathData="M 41.1,23.8C 40.547981774806985,23.08834635019302 38.34001822519301,20.24165364980698 37.788,19.53" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_2_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillAlpha" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="fillAlpha" + android:startOffset="50" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:pathData="M 18.6,23.8C 19.16757813692093,23.08502601385117 21.43742186307907,20.224973986148832 22.005,19.51" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_3_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.3" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="50" + android:propertyName="fillColor" + android:startOffset="0" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="@color/biometric_face_icon_gray" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="17" + android:propertyName="fillColor" + android:startOffset="50" + android:valueFrom="@color/biometric_face_icon_gray" + android:valueTo="?android:attr/colorError" + android:valueType="colorType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0_G_0_T_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:pathData="M 30.3,31.45C 30.3,31.07740886211395 30.3,31.82259113788605 30.3,31.45" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="150" + android:pathData="M 30.3,31.45C 30.3,31.07740886211395 30.3,29.58759113788605 30.3,29.215" + android:propertyName="translateXY" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:startOffset="67"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_0_G_D_4_P_0"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="67" + android:propertyName="pathData" + android:startOffset="0" + android:valueFrom="M2.6 3.25 C2.6,3.25 -2.6,3.25 -2.6,3.25 C-2.6,3.25 -2.6,1.25 -2.6,1.25 C-2.6,1.25 0.6,1.25 0.6,1.25 C0.6,1.25 0.6,-3.25 0.6,-3.25 C0.6,-3.25 2.6,-3.25 2.6,-3.25 C2.6,-3.25 2.6,3.25 2.6,3.25c " + android:valueTo="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-3.25 -1.5,-3.25 C-1.5,-3.25 0.9,-3.25 0.9,-3.25 C0.9,-3.25 0.9,3.25 0.9,3.25c " + android:valueType="pathType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="150" + android:propertyName="pathData" + android:startOffset="67" + android:valueFrom="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-3.25 -1.5,-3.25 C-1.5,-3.25 0.9,-3.25 0.9,-3.25 C0.9,-3.25 0.9,3.25 0.9,3.25c " + android:valueTo="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-13.15 -1.5,-13.15 C-1.5,-13.15 0.9,-13.15 0.9,-13.15 C0.9,-13.15 0.9,3.25 0.9,3.25c " + android:valueType="pathType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + <objectAnimator + android:duration="100" + android:propertyName="pathData" + android:startOffset="217" + android:valueFrom="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-13.15 -1.5,-13.15 C-1.5,-13.15 0.9,-13.15 0.9,-13.15 C0.9,-13.15 0.9,3.25 0.9,3.25c " + android:valueTo="M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-11.71 -1.5,-11.71 C-1.5,-11.71 0.9,-11.71 0.9,-11.71 C0.9,-11.71 0.9,3.25 0.9,3.25c " + android:valueType="pathType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0" /> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="time_group"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> + <objectAnimator + android:duration="333" + android:propertyName="translateX" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/face_dialog_icon.xml b/packages/SystemUI/res/drawable/face_dialog_icon.xml deleted file mode 100644 index 6d28b5a105f2..000000000000 --- a/packages/SystemUI/res/drawable/face_dialog_icon.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2018 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24dp" - android:width="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path android:fillColor="#000" android:pathData="M9,11.75A1.25,1.25 0 0,0 7.75,13A1.25,1.25 0 0,0 9,14.25A1.25,1.25 0 0,0 10.25,13A1.25,1.25 0 0,0 9,11.75M15,11.75A1.25,1.25 0 0,0 13.75,13A1.25,1.25 0 0,0 15,14.25A1.25,1.25 0 0,0 16.25,13A1.25,1.25 0 0,0 15,11.75M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,11.71 4,11.42 4.05,11.14C6.41,10.09 8.28,8.16 9.26,5.77C11.07,8.33 14.05,10 17.42,10C18.2,10 18.95,9.91 19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20Z" /> -</vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/fingerprint_dialog_error_to_fp.xml b/packages/SystemUI/res/drawable/fingerprint_dialog_error_to_fp.xml index af25e44bd746..8f411f4c07fe 100644 --- a/packages/SystemUI/res/drawable/fingerprint_dialog_error_to_fp.xml +++ b/packages/SystemUI/res/drawable/fingerprint_dialog_error_to_fp.xml @@ -18,133 +18,138 @@ xmlns:aapt="http://schemas.android.com/aapt"> <aapt:attr name="android:drawable"> <vector - android:width="24dp" - android:height="24dp" - android:viewportHeight="24" - android:viewportWidth="24"> + android:width="60dp" + android:height="60dp" + android:viewportHeight="60" + android:viewportWidth="60"> <group android:name="_R_G"> <group - android:name="_R_G_L_2_G" - android:pivotX="-33" - android:pivotY="-34" - android:rotation="180" - android:scaleX="0.738" - android:scaleY="0.738" - android:translateX="45" - android:translateY="46.4"> - <path - android:name="_R_G_L_2_G_D_0_P_0" - android:pathData=" M-25.36 -24.41 C-25.93,-24.31 -26.49,-24.27 -26.81,-24.27 C-28.11,-24.27 -29.35,-24.62 -30.43,-25.4 C-32.11,-26.6 -33.2,-28.57 -33.2,-30.79 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="0" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_2_G_D_1_P_0" - android:pathData=" M-36.14 -21.78 C-37.15,-22.98 -37.72,-23.7 -38.51,-25.29 C-39.33,-26.94 -39.82,-28.78 -39.82,-30.77 C-39.82,-34.43 -36.85,-37.4 -33.19,-37.4 C-29.52,-37.4 -26.55,-34.43 -26.55,-30.77 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="0" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_2_G_D_2_P_0" - android:pathData=" M-42.19 -25.68 C-42.95,-27.82 -43.09,-29.54 -43.09,-30.8 C-43.09,-32.27 -42.84,-33.65 -42.27,-34.9 C-40.71,-38.35 -37.24,-40.75 -33.2,-40.75 C-27.71,-40.75 -23.26,-36.3 -23.26,-30.8 C-23.26,-28.97 -24.74,-27.49 -26.57,-27.49 C-28.4,-27.49 -29.89,-28.97 -29.89,-30.8 C-29.89,-32.64 -31.37,-34.12 -33.2,-34.12 C-35.04,-34.12 -36.52,-32.64 -36.52,-30.8 C-36.52,-28.23 -35.53,-25.92 -33.92,-24.22 C-32.69,-22.93 -31.48,-22.12 -29.44,-21.53 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="1" /> - <path - android:name="_R_G_L_2_G_D_3_P_0" - android:pathData=" M-44.06 -38.17 C-42.87,-39.94 -41.39,-41.41 -39.51,-42.44 C-37.62,-43.47 -35.46,-44.05 -33.16,-44.05 C-30.88,-44.05 -28.72,-43.47 -26.85,-42.45 C-24.97,-41.43 -23.48,-39.97 -22.29,-38.21 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="1" /> - <path - android:name="_R_G_L_2_G_D_4_P_0" - android:pathData=" M-25.72 -45.45 C-27.99,-46.76 -30.43,-47.52 -33.28,-47.52 C-36.13,-47.52 -38.51,-46.74 -40.62,-45.45 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="0" - android:trimPathOffset="0" - android:trimPathStart="0" /> - </group> - <group - android:name="_R_G_L_1_G" - android:rotation="10" - android:translateX="12" - android:translateY="12"> - <path - android:name="_R_G_L_1_G_D_0_P_0" - android:pathData=" M0 -9 C4.97,-9 9,-4.97 9,0 C9,4.97 4.97,9 0,9 C-4.97,9 -9,4.97 -9,0 C-9,-4.97 -4.97,-9 0,-9c " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorError" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="2" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="0" /> - </group> - <group - android:name="_R_G_L_0_G" - android:translateX="12" - android:translateY="12"> + android:name="_R_G_L_1_G_N_4_T_0" + android:translateX="30" + android:translateY="30"> <group - android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" - android:pivotY="-0.012" - android:rotation="0" - android:scaleX="1" - android:scaleY="1"> + android:name="_R_G_L_1_G" + android:pivotX="114" + android:pivotY="114" + android:scaleX="0.42200000000000004" + android:scaleY="0.42200000000000004" + android:translateX="-114" + android:translateY="-114"> + <path + android:name="_R_G_L_1_G_D_0_P_0" + android:pathData=" M79.63 67.24 C79.63,67.24 111.5,47.42 147.83,67.24 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="0" + android:trimPathOffset="0" + android:trimPathStart="0" /> <path - android:name="_R_G_L_0_G_D_0_P_0" - android:fillAlpha="1" - android:fillColor="?android:attr/colorError" - android:fillType="nonZero" - android:pathData=" M1.1 3.94 C1.1,4.55 0.61,5.04 0,5.04 C-0.61,5.04 -1.1,4.55 -1.1,3.94 C-1.1,3.33 -0.61,2.84 0,2.84 C0.61,2.84 1.1,3.33 1.1,3.94c " /> + android:name="_R_G_L_1_G_D_1_P_0" + android:pathData=" M64.27 98.07 C64.27,98.07 80.13,73.02 113.98,73.02 C147.83,73.02 163.56,97.26 163.56,97.26 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="0" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_1_G_D_2_P_0" + android:pathData=" M72.53 151.07 C72.53,151.07 62.46,122.89 76.16,105.55 C89.86,88.21 106.72,86.73 113.98,86.73 C121.08,86.73 153.51,90.62 158.7,125.87 C159.14,128.82 158.8,132.88 157.18,136.09 C154.88,140.63 150.62,143.63 145.85,143.97 C133.78,144.85 129.76,137.92 129.26,128.49 C128.88,121.19 122.49,115.35 113.15,115.35 C102.91,115.35 95.97,126.69 99.77,139.74 C103.57,152.78 111.33,163.85 130.32,169.13 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="0" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_1_G_D_3_P_0" + android:pathData=" M100.6 167.84 C100.6,167.84 82.76,152.1 83.75,130.31 C84.75,108.53 102.58,100.7 113.73,100.7 C124.87,100.7 144.19,108.56 144.19,130.01 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="0" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_1_G_D_4_P_0" + android:pathData=" M113.73 129.17 C113.73,129.17 113.15,161.33 149.15,156.58 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="0" + android:trimPathOffset="0" + android:trimPathStart="0" /> </group> + </group> + <group + android:name="_R_G_L_0_G_N_4_T_0" + android:translateX="30" + android:translateY="30"> <group - android:name="_R_G_L_0_G_D_0_P_1_G_0_T_0" - android:pivotY="-0.012" - android:rotation="0" - android:scaleX="1" - android:scaleY="1"> + android:name="_R_G_L_0_G" + android:translateX="-30.05" + android:translateY="-30"> + <group + android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" + android:scaleX="1" + android:scaleY="1" + android:translateX="30" + android:translateY="38.75"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorError" + android:fillType="nonZero" + android:pathData=" M-1.2 -1.25 C-1.2,-1.25 1.2,-1.25 1.2,-1.25 C1.2,-1.25 1.2,1.25 1.2,1.25 C1.2,1.25 -1.2,1.25 -1.2,1.25 C-1.2,1.25 -1.2,-1.25 -1.2,-1.25c " /> + </group> + <group + android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0" + android:pivotX="0.002" + android:pivotY="7.488" + android:scaleX="1" + android:scaleY="1" + android:translateX="30" + android:translateY="25"> + <path + android:name="_R_G_L_0_G_D_1_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorError" + android:fillType="nonZero" + android:pathData=" M-1.2 -7.5 C-1.2,-7.5 1.2,-7.5 1.2,-7.5 C1.2,-7.5 1.2,7.5 1.2,7.5 C1.2,7.5 -1.2,7.5 -1.2,7.5 C-1.2,7.5 -1.2,-7.5 -1.2,-7.5c " /> + </group> <path - android:name="_R_G_L_0_G_D_0_P_1" - android:fillAlpha="1" - android:fillColor="?android:attr/colorError" - android:fillType="nonZero" - android:pathData=" M1 -4.06 C1,-4.06 1,-0.06 1,-0.06 C1,0.49 0.55,0.94 0,0.94 C-0.55,0.94 -1,0.49 -1,-0.06 C-1,-0.06 -1,-4.06 -1,-4.06 C-1,-4.61 -0.55,-5.06 0,-5.06 C0.55,-5.06 1,-4.61 1,-4.06c " /> + android:name="_R_G_L_0_G_D_2_P_0" + android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorError" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="2.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> </group> </group> </group> <group android:name="time_group" /> </vector> </aapt:attr> - <target android:name="_R_G_L_2_G_D_0_P_0"> + <target android:name="_R_G_L_1_G_D_0_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="350" + android:duration="83" android:propertyName="trimPathEnd" android:startOffset="0" android:valueFrom="0" @@ -155,9 +160,9 @@ </aapt:attr> </objectAnimator> <objectAnimator - android:duration="350" + android:duration="250" android:propertyName="trimPathEnd" - android:startOffset="350" + android:startOffset="83" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> @@ -168,11 +173,11 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_1_P_0"> + <target android:name="_R_G_L_1_G_D_1_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="267" + android:duration="83" android:propertyName="trimPathEnd" android:startOffset="0" android:valueFrom="0" @@ -183,9 +188,9 @@ </aapt:attr> </objectAnimator> <objectAnimator - android:duration="433" + android:duration="250" android:propertyName="trimPathEnd" - android:startOffset="267" + android:startOffset="83" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> @@ -196,67 +201,39 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_2_P_0"> + <target android:name="_R_G_L_1_G_D_2_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="250" - android:propertyName="trimPathStart" + android:duration="83" + android:propertyName="trimPathEnd" android:startOffset="0" - android:valueFrom="1" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="250" - android:propertyName="trimPathStart" - android:startOffset="250" - android:valueFrom="1" + android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_3_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="350" - android:propertyName="trimPathStart" - android:startOffset="0" - android:valueFrom="1" + android:duration="250" + android:propertyName="trimPathEnd" + android:startOffset="83" + android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator - android:duration="117" - android:propertyName="trimPathStart" - android:startOffset="350" - android:valueFrom="1" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_4_P_0"> + <target android:name="_R_G_L_1_G_D_3_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="417" + android:duration="83" android:propertyName="trimPathEnd" android:startOffset="0" android:valueFrom="0" @@ -267,9 +244,9 @@ </aapt:attr> </objectAnimator> <objectAnimator - android:duration="117" + android:duration="250" android:propertyName="trimPathEnd" - android:startOffset="417" + android:startOffset="83" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> @@ -280,43 +257,26 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G"> + <target android:name="_R_G_L_1_G_D_4_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="200" - android:propertyName="rotation" + android:duration="83" + android:propertyName="trimPathEnd" android:startOffset="0" - android:valueFrom="180" - android:valueTo="180" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="500" - android:propertyName="rotation" - android:startOffset="200" - android:valueFrom="180" + android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_1_G_D_0_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="383" + android:duration="250" android:propertyName="trimPathEnd" - android:startOffset="0" - android:valueFrom="1" - android:valueTo="0" + android:startOffset="83" + android:valueFrom="0" + android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> @@ -325,185 +285,129 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_1_G"> + <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="33" - android:propertyName="rotation" + android:duration="67" + android:propertyName="scaleX" android:startOffset="0" - android:valueFrom="10" - android:valueTo="10" + android:valueFrom="1" + android:valueTo="1.1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.853,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="367" - android:propertyName="rotation" - android:startOffset="33" - android:valueFrom="10" - android:valueTo="-180" + android:duration="67" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="1.1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.853,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="17" - android:propertyName="rotation" - android:startOffset="0" - android:valueFrom="0" + android:duration="100" + android:propertyName="scaleX" + android:startOffset="67" + android:valueFrom="1.1" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.2,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.92,1.06 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="417" - android:propertyName="rotation" - android:startOffset="17" - android:valueFrom="0" - android:valueTo="-180" + android:duration="100" + android:propertyName="scaleY" + android:startOffset="67" + android:valueFrom="1.1" + android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.2,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.92,1.06 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> + <target android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="117" + android:duration="67" android:propertyName="scaleX" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.659,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="117" + android:duration="67" android:propertyName="scaleY" android:startOffset="0" android:valueFrom="1" - android:valueTo="1" + android:valueTo="1.1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="317" + android:duration="100" android:propertyName="scaleX" - android:startOffset="117" + android:startOffset="67" android:valueFrom="1" - android:valueTo="0" + android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="317" + android:duration="100" android:propertyName="scaleY" - android:startOffset="117" - android:valueFrom="1" + android:startOffset="67" + android:valueFrom="1.1" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.92,1.096 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_0_G_D_0_P_1_G_0_T_0"> + <target android:name="_R_G_L_0_G_D_2_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="17" - android:propertyName="rotation" - android:startOffset="0" - android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.2,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="417" - android:propertyName="rotation" - android:startOffset="17" - android:valueFrom="0" - android:valueTo="-180" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.2,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_D_0_P_1_G_0_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="117" - android:propertyName="scaleX" - android:startOffset="0" - android:valueFrom="1" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="117" - android:propertyName="scaleY" + android:duration="67" + android:propertyName="trimPathEnd" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="317" - android:propertyName="scaleX" - android:startOffset="117" - android:valueFrom="1" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="317" - android:propertyName="scaleY" - android:startOffset="117" + android:duration="133" + android:propertyName="trimPathEnd" + android:startOffset="67" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -513,7 +417,7 @@ <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="717" + android:duration="350" android:propertyName="translateX" android:startOffset="0" android:valueFrom="0" @@ -522,4 +426,4 @@ </set> </aapt:attr> </target> -</animated-vector> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/fingerprint_dialog_fp_to_error.xml b/packages/SystemUI/res/drawable/fingerprint_dialog_fp_to_error.xml index 1a7a846b140e..89b822840b14 100644 --- a/packages/SystemUI/res/drawable/fingerprint_dialog_fp_to_error.xml +++ b/packages/SystemUI/res/drawable/fingerprint_dialog_fp_to_error.xml @@ -18,821 +18,374 @@ xmlns:aapt="http://schemas.android.com/aapt"> <aapt:attr name="android:drawable"> <vector - android:width="24dp" - android:height="24dp" - android:viewportHeight="24" - android:viewportWidth="24"> + android:width="60dp" + android:height="60dp" + android:viewportHeight="60" + android:viewportWidth="60"> <group android:name="_R_G"> <group - android:name="_R_G_L_3_G" - android:pivotX="-33" - android:pivotY="-34" - android:rotation="0" - android:scaleX="0.738" - android:scaleY="0.738" - android:translateX="45" - android:translateY="46.4"> - <path - android:name="_R_G_L_3_G_D_0_P_0" - android:pathData=" M-25.36 -24.41 C-25.93,-24.31 -26.49,-24.27 -26.81,-24.27 C-28.11,-24.27 -29.35,-24.62 -30.43,-25.4 C-32.11,-26.6 -33.2,-28.57 -33.2,-30.79 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_3_G_D_1_P_0" - android:pathData=" M-36.14 -21.78 C-37.15,-22.98 -37.72,-23.7 -38.51,-25.29 C-39.33,-26.94 -39.82,-28.78 -39.82,-30.77 C-39.82,-34.43 -36.85,-37.4 -33.19,-37.4 C-29.52,-37.4 -26.55,-34.43 -26.55,-30.77 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_3_G_D_2_P_0" - android:pathData=" M-42.19 -25.68 C-42.95,-27.82 -43.09,-29.54 -43.09,-30.8 C-43.09,-32.27 -42.84,-33.65 -42.27,-34.9 C-40.71,-38.35 -37.24,-40.75 -33.2,-40.75 C-27.71,-40.75 -23.26,-36.3 -23.26,-30.8 C-23.26,-28.97 -24.74,-27.49 -26.57,-27.49 C-28.4,-27.49 -29.89,-28.97 -29.89,-30.8 C-29.89,-32.64 -31.37,-34.12 -33.2,-34.12 C-35.04,-34.12 -36.52,-32.64 -36.52,-30.8 C-36.52,-28.23 -35.53,-25.92 -33.92,-24.22 C-32.69,-22.93 -31.48,-22.12 -29.44,-21.53 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_3_G_D_3_P_0" - android:pathData=" M-44.06 -38.17 C-42.87,-39.94 -41.39,-41.41 -39.51,-42.44 C-37.62,-43.47 -35.46,-44.05 -33.16,-44.05 C-30.88,-44.05 -28.72,-43.47 -26.85,-42.45 C-24.97,-41.43 -23.48,-39.97 -22.29,-38.21 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_3_G_D_4_P_0" - android:pathData=" M-25.72 -45.45 C-27.99,-46.76 -30.43,-47.52 -33.28,-47.52 C-36.13,-47.52 -38.51,-46.74 -40.62,-45.45 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorAccent" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="0" /> - </group> - <group - android:name="_R_G_L_2_G" - android:pivotX="-33" - android:pivotY="-34" - android:rotation="0" - android:scaleX="0.738" - android:scaleY="0.738" - android:translateX="45" - android:translateY="46.4"> - <path - android:name="_R_G_L_2_G_D_0_P_0" - android:pathData=" M-25.36 -24.41 C-25.93,-24.31 -26.49,-24.27 -26.81,-24.27 C-28.11,-24.27 -29.35,-24.62 -30.43,-25.4 C-32.11,-26.6 -33.2,-28.57 -33.2,-30.79 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorError" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="0" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_2_G_D_1_P_0" - android:pathData=" M-36.14 -21.78 C-37.15,-22.98 -37.72,-23.7 -38.51,-25.29 C-39.33,-26.94 -39.82,-28.78 -39.82,-30.77 C-39.82,-34.43 -36.85,-37.4 -33.19,-37.4 C-29.52,-37.4 -26.55,-34.43 -26.55,-30.77 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorError" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="0" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_2_G_D_2_P_0" - android:pathData=" M-42.19 -25.68 C-42.95,-27.82 -43.09,-29.54 -43.09,-30.8 C-43.09,-32.27 -42.84,-33.65 -42.27,-34.9 C-40.71,-38.35 -37.24,-40.75 -33.2,-40.75 C-27.71,-40.75 -23.26,-36.3 -23.26,-30.8 C-23.26,-28.97 -24.74,-27.49 -26.57,-27.49 C-28.4,-27.49 -29.89,-28.97 -29.89,-30.8 C-29.89,-32.64 -31.37,-34.12 -33.2,-34.12 C-35.04,-34.12 -36.52,-32.64 -36.52,-30.8 C-36.52,-28.23 -35.53,-25.92 -33.92,-24.22 C-32.69,-22.93 -31.48,-22.12 -29.44,-21.53 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorError" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="0" - android:trimPathOffset="0" - android:trimPathStart="0" /> - <path - android:name="_R_G_L_2_G_D_3_P_0" - android:pathData=" M-44.06 -38.17 C-42.87,-39.94 -41.39,-41.41 -39.51,-42.44 C-37.62,-43.47 -35.46,-44.05 -33.16,-44.05 C-30.88,-44.05 -28.72,-43.47 -26.85,-42.45 C-24.97,-41.43 -23.48,-39.97 -22.29,-38.21 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorError" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="1" /> - <path - android:name="_R_G_L_2_G_D_4_P_0" - android:pathData=" M-25.72 -45.45 C-27.99,-46.76 -30.43,-47.52 -33.28,-47.52 C-36.13,-47.52 -38.51,-46.74 -40.62,-45.45 " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorError" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="1.45" - android:trimPathEnd="0" - android:trimPathOffset="0" - android:trimPathStart="0" /> - </group> - <group - android:name="_R_G_L_1_G" - android:rotation="190" - android:translateX="12" - android:translateY="12"> - <path - android:name="_R_G_L_1_G_D_0_P_0" - android:pathData=" M0 -9 C4.97,-9 9,-4.97 9,0 C9,4.97 4.97,9 0,9 C-4.97,9 -9,4.97 -9,0 C-9,-4.97 -4.97,-9 0,-9c " - android:strokeAlpha="1" - android:strokeColor="?android:attr/colorError" - android:strokeLineCap="round" - android:strokeLineJoin="round" - android:strokeWidth="2" - android:trimPathEnd="1" - android:trimPathOffset="0" - android:trimPathStart="1" /> - </group> - <group - android:name="_R_G_L_0_G" - android:translateX="12" - android:translateY="12"> + android:name="_R_G_L_1_G_N_4_T_0" + android:translateX="30" + android:translateY="30"> <group - android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" - android:pivotY="-0.012" - android:rotation="184" - android:scaleX="0" - android:scaleY="0"> + android:name="_R_G_L_1_G" + android:pivotX="114" + android:pivotY="114" + android:scaleX="0.42244" + android:scaleY="0.42244" + android:translateX="-114" + android:translateY="-114"> <path - android:name="_R_G_L_0_G_D_0_P_0" - android:fillAlpha="1" - android:fillColor="?android:attr/colorError" - android:fillType="nonZero" - android:pathData=" M1.1 3.94 C1.1,4.55 0.61,5.04 0,5.04 C-0.61,5.04 -1.1,4.55 -1.1,3.94 C-1.1,3.33 -0.61,2.84 0,2.84 C0.61,2.84 1.1,3.33 1.1,3.94c " /> + android:name="_R_G_L_1_G_D_0_P_0" + android:pathData=" M79.63 67.24 C79.63,67.24 111.5,47.42 147.83,67.24 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_1_G_D_1_P_0" + android:pathData=" M64.27 98.07 C64.27,98.07 80.13,73.02 113.98,73.02 C147.83,73.02 163.56,97.26 163.56,97.26 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_1_G_D_2_P_0" + android:pathData=" M72.53 151.07 C72.53,151.07 62.46,122.89 76.16,105.55 C89.86,88.21 106.72,86.73 113.98,86.73 C121.08,86.73 153.51,90.62 158.7,125.87 C159.14,128.82 158.8,132.88 157.18,136.09 C154.88,140.63 150.62,143.63 145.85,143.97 C133.78,144.85 129.76,137.92 129.26,128.49 C128.88,121.19 122.49,115.35 113.15,115.35 C102.91,115.35 95.97,126.69 99.77,139.74 C103.57,152.78 111.33,163.85 130.32,169.13 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_1_G_D_3_P_0" + android:pathData=" M100.6 167.84 C100.6,167.84 82.76,152.1 83.75,130.31 C84.75,108.53 102.58,100.7 113.73,100.7 C124.87,100.7 144.19,108.56 144.19,130.01 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> + <path + android:name="_R_G_L_1_G_D_4_P_0" + android:pathData=" M113.73 129.17 C113.73,129.17 113.15,161.33 149.15,156.58 " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorAccent" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="5.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="0" /> </group> + </group> + <group + android:name="_R_G_L_0_G_N_4_T_0" + android:translateX="30" + android:translateY="30"> <group - android:name="_R_G_L_0_G_D_0_P_1_G_0_T_0" - android:pivotY="-0.012" - android:rotation="184" - android:scaleX="0" - android:scaleY="0"> + android:name="_R_G_L_0_G" + android:translateX="-30.05" + android:translateY="-30"> + <group + android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" + android:scaleX="0" + android:scaleY="0" + android:translateX="30" + android:translateY="38.75"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorError" + android:fillType="nonZero" + android:pathData=" M-1.2 -1.25 C-1.2,-1.25 1.2,-1.25 1.2,-1.25 C1.2,-1.25 1.2,1.25 1.2,1.25 C1.2,1.25 -1.2,1.25 -1.2,1.25 C-1.2,1.25 -1.2,-1.25 -1.2,-1.25c " /> + </group> + <group + android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0" + android:pivotX="0.002" + android:pivotY="7.488" + android:scaleX="1" + android:scaleY="0" + android:translateX="30" + android:translateY="25"> + <path + android:name="_R_G_L_0_G_D_1_P_0" + android:fillAlpha="1" + android:fillColor="?android:attr/colorError" + android:fillType="nonZero" + android:pathData=" M-1.2 -7.5 C-1.2,-7.5 1.2,-7.5 1.2,-7.5 C1.2,-7.5 1.2,7.5 1.2,7.5 C1.2,7.5 -1.2,7.5 -1.2,7.5 C-1.2,7.5 -1.2,-7.5 -1.2,-7.5c " /> + </group> <path - android:name="_R_G_L_0_G_D_0_P_1" - android:fillAlpha="1" - android:fillColor="?android:attr/colorError" - android:fillType="nonZero" - android:pathData=" M1 -4.06 C1,-4.06 1,-0.06 1,-0.06 C1,0.49 0.55,0.94 0,0.94 C-0.55,0.94 -1,0.49 -1,-0.06 C-1,-0.06 -1,-4.06 -1,-4.06 C-1,-4.61 -0.55,-5.06 0,-5.06 C0.55,-5.06 1,-4.61 1,-4.06c " /> + android:name="_R_G_L_0_G_D_2_P_0" + android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c " + android:strokeAlpha="1" + android:strokeColor="?android:attr/colorError" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="2.5" + android:trimPathEnd="1" + android:trimPathOffset="0" + android:trimPathStart="1" /> </group> </group> </group> <group android:name="time_group" /> </vector> </aapt:attr> - <target android:name="_R_G_L_3_G_D_0_P_0"> + <target android:name="_R_G_L_1_G_D_0_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="150" + android:duration="167" android:propertyName="trimPathStart" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_3_G_D_1_P_0"> + <target android:name="_R_G_L_1_G_D_1_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="33" + android:duration="167" android:propertyName="trimPathStart" android:startOffset="0" android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="150" - android:propertyName="trimPathStart" - android:startOffset="33" - android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_3_G_D_2_P_0"> + <target android:name="_R_G_L_1_G_D_2_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="17" + android:duration="167" android:propertyName="trimPathStart" android:startOffset="0" android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="217" - android:propertyName="trimPathStart" - android:startOffset="17" - android:valueFrom="0" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_3_G_D_3_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="17" - android:propertyName="trimPathEnd" - android:startOffset="0" - android:valueFrom="1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="133" - android:propertyName="trimPathEnd" - android:startOffset="17" - android:valueFrom="1" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_3_G_D_4_P_0"> + <target android:name="_R_G_L_1_G_D_3_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="17" + android:duration="167" android:propertyName="trimPathStart" android:startOffset="0" android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="67" - android:propertyName="trimPathStart" - android:startOffset="17" - android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_3_G"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="100" - android:propertyName="rotation" - android:startOffset="0" - android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="567" - android:propertyName="rotation" - android:startOffset="100" - android:valueFrom="0" - android:valueTo="-305" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_0_P_0"> + <target android:name="_R_G_L_1_G_D_4_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="150" - android:propertyName="trimPathStart" - android:startOffset="0" - android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.5,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator android:duration="167" android:propertyName="trimPathStart" - android:startOffset="150" - android:valueFrom="0" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.5,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_0_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="167" - android:propertyName="trimPathEnd" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_1_P_0"> + <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="133" - android:propertyName="trimPathStart" + android:duration="167" + android:propertyName="scaleX" android:startOffset="0" android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.5,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="200" - android:propertyName="trimPathStart" - android:startOffset="133" - android:valueFrom="0" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.5,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.08,0.06 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_1_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="17" - android:propertyName="trimPathEnd" + android:duration="167" + android:propertyName="scaleY" android:startOffset="0" android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.08,0.06 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="217" - android:propertyName="trimPathEnd" - android:startOffset="17" + android:duration="100" + android:propertyName="scaleX" + android:startOffset="167" android:valueFrom="0" - android:valueTo="1" + android:valueTo="1.1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.08,0.06 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_2_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="133" - android:propertyName="trimPathStart" - android:startOffset="0" + android:duration="100" + android:propertyName="scaleY" + android:startOffset="167" android:valueFrom="0" - android:valueTo="0" + android:valueTo="1.1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.08,0.06 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="200" - android:propertyName="trimPathStart" - android:startOffset="133" - android:valueFrom="0" + android:duration="67" + android:propertyName="scaleX" + android:startOffset="267" + android:valueFrom="1.1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.147,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_2_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="250" - android:propertyName="trimPathEnd" - android:startOffset="0" - android:valueFrom="0" + android:duration="67" + android:propertyName="scaleY" + android:startOffset="267" + android:valueFrom="1.1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.147,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_3_P_0"> + <target android:name="_R_G_L_0_G_D_1_P_0_G_0_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:duration="167" - android:propertyName="trimPathStart" - android:startOffset="0" - android:valueFrom="1" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_3_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="117" - android:propertyName="trimPathEnd" + android:propertyName="scaleX" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="117" - android:propertyName="trimPathEnd" - android:startOffset="117" - android:valueFrom="1" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_4_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="100" - android:propertyName="trimPathStart" - android:startOffset="0" - android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.5,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="100" - android:propertyName="trimPathStart" - android:startOffset="100" - android:valueFrom="0" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.5,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_D_4_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="133" - android:propertyName="trimPathEnd" - android:startOffset="0" - android:valueFrom="0" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="100" - android:propertyName="rotation" + android:duration="167" + android:propertyName="scaleY" android:startOffset="0" android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="567" - android:propertyName="rotation" - android:startOffset="100" - android:valueFrom="0" - android:valueTo="-305" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_1_G_D_0_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="167" - android:propertyName="trimPathStart" - android:startOffset="0" - android:valueFrom="1" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.08,0.096 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="533" - android:propertyName="trimPathStart" + android:duration="100" + android:propertyName="scaleX" android:startOffset="167" android:valueFrom="1" - android:valueTo="0" + android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_1_G"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> <objectAnimator - android:duration="150" - android:propertyName="rotation" - android:startOffset="0" - android:valueFrom="190" - android:valueTo="190" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="550" - android:propertyName="rotation" - android:startOffset="150" - android:valueFrom="190" - android:valueTo="-6" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="283" - android:propertyName="rotation" - android:startOffset="0" - android:valueFrom="184" - android:valueTo="184" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="317" - android:propertyName="rotation" - android:startOffset="283" - android:valueFrom="184" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="283" - android:propertyName="scaleX" - android:startOffset="0" - android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="283" + android:duration="100" android:propertyName="scaleY" - android:startOffset="0" + android:startOffset="167" android:valueFrom="0" - android:valueTo="0" + android:valueTo="1.1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.08,0.096 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="317" + android:duration="67" android:propertyName="scaleX" - android:startOffset="283" - android:valueFrom="0" + android:startOffset="267" + android:valueFrom="1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.341,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> <objectAnimator - android:duration="317" + android:duration="67" android:propertyName="scaleY" - android:startOffset="283" - android:valueFrom="0" + android:startOffset="267" + android:valueFrom="1.1" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_D_0_P_1_G_0_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator - android:duration="283" - android:propertyName="rotation" - android:startOffset="0" - android:valueFrom="184" - android:valueTo="184" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="317" - android:propertyName="rotation" - android:startOffset="283" - android:valueFrom="184" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_0_G_D_0_P_1_G_0_T_0"> + <target android:name="_R_G_L_0_G_D_2_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="283" - android:propertyName="scaleX" - android:startOffset="0" - android:valueFrom="0" - android:valueTo="0" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="283" - android:propertyName="scaleY" + android:duration="267" + android:propertyName="trimPathStart" android:startOffset="0" - android:valueFrom="0" + android:valueFrom="1" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="317" - android:propertyName="scaleX" - android:startOffset="283" - android:valueFrom="0" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> - </aapt:attr> - </objectAnimator> - <objectAnimator - android:duration="317" - android:propertyName="scaleY" - android:startOffset="283" - android:valueFrom="0" - android:valueTo="1" - android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.6,1 1.0,1.0" /> + <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -842,7 +395,7 @@ <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator - android:duration="717" + android:duration="350" android:propertyName="translateX" android:startOffset="0" android:valueFrom="0" @@ -851,4 +404,4 @@ </set> </aapt:attr> </target> -</animated-vector> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index b3567f892c44..d5f29badd893 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -130,6 +130,7 @@ <!-- Biometric dialog colors --> <color name="biometric_dialog_dim_color">#80000000</color> <!-- 50% black --> + <color name="biometric_face_icon_gray">#ffbdc1c6</color> <!-- Logout button --> <color name="logout_button_bg_color">#ccffffff</color> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 6037dfc5154d..06df0e763498 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -861,9 +861,6 @@ <dimen name="bottom_padding">48dp</dimen> <dimen name="edge_margin">8dp</dimen> - <dimen name="rounded_corner_radius">@*android:dimen/rounded_corner_radius</dimen> - <dimen name="rounded_corner_radius_top">@*android:dimen/rounded_corner_radius_top</dimen> - <dimen name="rounded_corner_radius_bottom">@*android:dimen/rounded_corner_radius_bottom</dimen> <dimen name="rounded_corner_content_padding">0dp</dimen> <dimen name="nav_content_padding">0dp</dimen> <dimen name="nav_quick_scrub_track_edge_padding">24dp</dimen> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ContextCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ContextCompat.java new file mode 100644 index 000000000000..51fcb0a841ca --- /dev/null +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ContextCompat.java @@ -0,0 +1,34 @@ +/* + * 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.systemui.shared.system; + +import android.content.Context; + +/** + * Wraps a context to expose some methods for launcher to call. + */ +public class ContextCompat { + private final Context mWrapped; + + public ContextCompat(Context context) { + mWrapped = context; + } + + public int getUserId() { + return mWrapped.getUserId(); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 6e5042940175..3cc9bb6f668f 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -65,6 +65,7 @@ import com.android.systemui.statusbar.notification.VisualStabilityManager; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; +import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.LockscreenGestureLogger; @@ -156,6 +157,12 @@ public class Dependency extends SystemUI { public static final String LEAK_REPORT_EMAIL_NAME = "leak_report_email"; /** + * Whether this platform supports long-pressing notifications to show notification channel + * settings. + */ + public static final String ALLOW_NOTIFICATION_LONG_PRESS_NAME = "allow_notif_longpress"; + + /** * Key for getting a background Looper for background work. */ public static final DependencyKey<Looper> BG_LOOPER = new DependencyKey<>(BG_LOOPER_NAME); @@ -270,6 +277,8 @@ public class Dependency extends SystemUI { @Inject Lazy<NotificationAlertingManager> mNotificationAlertingManager; @Inject Lazy<SensorPrivacyManager> mSensorPrivacyManager; + @Inject Lazy<AutoHideController> mAutoHideController; + @Inject Lazy<ForegroundServiceNotificationListener> mForegroundServiceNotificationListener; @Inject @Named(BG_LOOPER_NAME) Lazy<Looper> mBgLooper; @Inject @Named(BG_HANDLER_NAME) Lazy<Handler> mBgHandler; @Inject @Named(MAIN_HANDLER_NAME) Lazy<Handler> mMainHandler; @@ -442,6 +451,14 @@ public class Dependency extends SystemUI { mProviders.put(BubbleController.class, mBubbleController::get); mProviders.put(NotificationEntryManager.class, mNotificationEntryManager::get); mProviders.put(NotificationAlertingManager.class, mNotificationAlertingManager::get); + mProviders.put(ForegroundServiceNotificationListener.class, + mForegroundServiceNotificationListener::get); + + // TODO(b/118592525): to support multi-display , we start to add something which is + // per-display, while others may be global. I think it's time to add + // a new class maybe named DisplayDependency to solve per-display + // Dependency problem. + mProviders.put(AutoHideController.class, mAutoHideController::get); sDependency = this; } @@ -511,6 +528,9 @@ public class Dependency extends SystemUI { public static void initDependencies(Context context) { if (sDependency != null) return; Dependency d = new Dependency(); + SystemUIFactory.getInstance().getRootComponent() + .createDependency() + .createSystemUI(d); d.mContext = context; d.mComponents = new HashMap<>(); d.start(); diff --git a/packages/SystemUI/src/com/android/systemui/DependencyBinder.java b/packages/SystemUI/src/com/android/systemui/DependencyBinder.java index 1ee1dcf74555..f324a05bafff 100644 --- a/packages/SystemUI/src/com/android/systemui/DependencyBinder.java +++ b/packages/SystemUI/src/com/android/systemui/DependencyBinder.java @@ -219,12 +219,6 @@ public abstract class DependencyBinder { /** */ @Binds - public abstract ForegroundServiceController provideForegroundService( - ForegroundServiceControllerImpl controllerImpl); - - /** - */ - @Binds public abstract PowerUI.WarningsUI provideWarningsUi(PowerNotificationWarnings controllerImpl); /** diff --git a/packages/SystemUI/src/com/android/systemui/DependencyProvider.java b/packages/SystemUI/src/com/android/systemui/DependencyProvider.java index 5c9b9990058e..88e32cbeaa29 100644 --- a/packages/SystemUI/src/com/android/systemui/DependencyProvider.java +++ b/packages/SystemUI/src/com/android/systemui/DependencyProvider.java @@ -42,9 +42,8 @@ import com.android.systemui.plugins.PluginInitializerImpl; import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.shared.plugins.PluginManagerImpl; import com.android.systemui.statusbar.NavigationBarController; +import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.ConfigurationControllerImpl; -import com.android.systemui.statusbar.phone.ShadeController; -import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.DataSaverController; import com.android.systemui.statusbar.policy.NetworkController; @@ -140,12 +139,6 @@ public class DependencyProvider { @Singleton @Provides - public ShadeController provideShadeController(Context context) { - return SysUiServiceProvider.getComponent(context, StatusBar.class); - } - - @Singleton - @Provides public SensorPrivacyManager provideSensorPrivacyManager(Context context) { return context.getSystemService(SensorPrivacyManager.class); } @@ -181,4 +174,11 @@ public class DependencyProvider { public ConfigurationController provideConfigurationController(Context context) { return new ConfigurationControllerImpl(context); } + + @Singleton + @Provides + public AutoHideController provideAutoHideController(Context context, + @Named(MAIN_HANDLER_NAME) Handler mainHandler) { + return new AutoHideController(context, mainHandler); + } } diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java index ae6ee2af29fd..df0d7872bc61 100644 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java @@ -15,65 +15,158 @@ package com.android.systemui; import android.annotation.Nullable; +import android.os.UserHandle; import android.service.notification.StatusBarNotification; import android.util.ArraySet; +import android.util.SparseArray; -public interface ForegroundServiceController { - /** - * @param sbn notification that was just posted - * @param importance - */ - void addNotification(StatusBarNotification sbn, int importance); +import com.android.internal.messages.nano.SystemMessageProto; + +import javax.inject.Inject; +import javax.inject.Singleton; + +/** + * Tracks state of foreground services and notifications related to foreground services per user. + */ +@Singleton +public class ForegroundServiceController { + + private final SparseArray<ForegroundServicesUserState> mUserServices = new SparseArray<>(); + private final Object mMutex = new Object(); + + @Inject + public ForegroundServiceController() { + } /** - * @param sbn notification that was just changed in some way - * @param newImportance + * @return true if this user has services missing notifications and therefore needs a + * disclosure notification. */ - void updateNotification(StatusBarNotification sbn, int newImportance); + public boolean isDisclosureNeededForUser(int userId) { + synchronized (mMutex) { + final ForegroundServicesUserState services = mUserServices.get(userId); + if (services == null) return false; + return services.isDisclosureNeeded(); + } + } /** - * @param sbn notification that was just canceled + * @return true if this user/pkg has a missing or custom layout notification and therefore needs + * a disclosure notification for system alert windows. */ - boolean removeNotification(StatusBarNotification sbn); + public boolean isSystemAlertWarningNeeded(int userId, String pkg) { + synchronized (mMutex) { + final ForegroundServicesUserState services = mUserServices.get(userId); + if (services == null) return false; + return services.getStandardLayoutKey(pkg) == null; + } + } /** - * @param userId - * @return true if this user has services missing notifications and therefore needs a - * disclosure notification. + * Returns the key of the foreground service from this package using the standard template, + * if one exists. */ - boolean isDungeonNeededForUser(int userId); + @Nullable + public String getStandardLayoutKey(int userId, String pkg) { + synchronized (mMutex) { + final ForegroundServicesUserState services = mUserServices.get(userId); + if (services == null) return null; + return services.getStandardLayoutKey(pkg); + } + } /** - * @param sbn - * @return true if sbn is the system-provided "dungeon" (list of running foreground services). + * Gets active app ops for this user and package */ - boolean isDungeonNotification(StatusBarNotification sbn); + @Nullable + public ArraySet<Integer> getAppOps(int userId, String pkg) { + synchronized (mMutex) { + final ForegroundServicesUserState services = mUserServices.get(userId); + if (services == null) { + return null; + } + return services.getFeatures(pkg); + } + } /** - * @return true if sbn is one of the window manager "drawing over other apps" notifications + * Records active app ops. App Ops are stored in FSC in addition to NotificationData in + * case they change before we have a notification to tag. */ - boolean isSystemAlertNotification(StatusBarNotification sbn); + public void onAppOpChanged(int code, int uid, String packageName, boolean active) { + int userId = UserHandle.getUserId(uid); + synchronized (mMutex) { + ForegroundServicesUserState userServices = mUserServices.get(userId); + if (userServices == null) { + userServices = new ForegroundServicesUserState(); + mUserServices.put(userId, userServices); + } + if (active) { + userServices.addOp(packageName, code); + } else { + userServices.removeOp(packageName, code); + } + } + } /** - * Returns the key of the foreground service from this package using the standard template, - * if one exists. + * Looks up the {@link ForegroundServicesUserState} for the given {@code userId}, then performs + * the given {@link UserStateUpdateCallback} on it. If no state exists for the user ID, creates + * a new one if {@code createIfNotFound} is true, then performs the update on the new state. + * If {@code createIfNotFound} is false, no update is performed. + * + * @return false if no user state was found and none was created; true otherwise. */ - @Nullable String getStandardLayoutKey(int userId, String pkg); + boolean updateUserState(int userId, + UserStateUpdateCallback updateCallback, + boolean createIfNotFound) { + synchronized (mMutex) { + ForegroundServicesUserState userState = mUserServices.get(userId); + if (userState == null) { + if (createIfNotFound) { + userState = new ForegroundServicesUserState(); + mUserServices.put(userId, userState); + } else { + return false; + } + } + return updateCallback.updateUserState(userState); + } + } /** - * @return true if this user/pkg has a missing or custom layout notification and therefore needs - * a disclosure notification for system alert windows. + * @return true if {@code sbn} is the system-provided disclosure notification containing the + * list of running foreground services. */ - boolean isSystemAlertWarningNeeded(int userId, String pkg); + public boolean isDisclosureNotification(StatusBarNotification sbn) { + return sbn.getId() == SystemMessageProto.SystemMessage.NOTE_FOREGROUND_SERVICES + && sbn.getTag() == null + && sbn.getPackageName().equals("android"); + } /** - * Records active app ops. App Ops are stored in FSC in addition to NotificationData in - * case they change before we have a notification to tag. + * @return true if sbn is one of the window manager "drawing over other apps" notifications */ - void onAppOpChanged(int code, int uid, String packageName, boolean active); + public boolean isSystemAlertNotification(StatusBarNotification sbn) { + return sbn.getPackageName().equals("android") + && sbn.getTag() != null + && sbn.getTag().contains("AlertWindowNotification"); + } /** - * Gets active app ops for this user and package + * Callback provided to {@link #updateUserState(int, UserStateUpdateCallback, boolean)} + * to perform the update. */ - @Nullable ArraySet<Integer> getAppOps(int userId, String packageName); + interface UserStateUpdateCallback { + /** + * Perform update operations on the provided {@code userState}. + * + * @return true if the update succeeded. + */ + boolean updateUserState(ForegroundServicesUserState userState); + + /** Called if the state was not found and was not created. */ + default void userStateNotFound(int userId) { + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java deleted file mode 100644 index ae446ddc91ab..000000000000 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java +++ /dev/null @@ -1,309 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package com.android.systemui; - -import android.app.Notification; -import android.app.NotificationManager; -import android.content.Context; -import android.os.Bundle; -import android.os.UserHandle; -import android.service.notification.StatusBarNotification; -import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.Log; -import android.util.SparseArray; - -import com.android.internal.messages.nano.SystemMessageProto; - -import java.util.Arrays; - -import javax.inject.Inject; -import javax.inject.Singleton; - -/** - * Foreground service controller, a/k/a Dianne's Dungeon. - */ -@Singleton -public class ForegroundServiceControllerImpl - implements ForegroundServiceController { - - // shelf life of foreground services before they go bad - public static final long FG_SERVICE_GRACE_MILLIS = 5000; - - private static final String TAG = "FgServiceController"; - private static final boolean DBG = false; - - private final Context mContext; - private final SparseArray<UserServices> mUserServices = new SparseArray<>(); - private final Object mMutex = new Object(); - - @Inject - public ForegroundServiceControllerImpl(Context context) { - mContext = context; - } - - @Override - public boolean isDungeonNeededForUser(int userId) { - synchronized (mMutex) { - final UserServices services = mUserServices.get(userId); - if (services == null) return false; - return services.isDungeonNeeded(); - } - } - - @Override - public boolean isSystemAlertWarningNeeded(int userId, String pkg) { - synchronized (mMutex) { - final UserServices services = mUserServices.get(userId); - if (services == null) return false; - return services.getStandardLayoutKey(pkg) == null; - } - } - - @Override - public String getStandardLayoutKey(int userId, String pkg) { - synchronized (mMutex) { - final UserServices services = mUserServices.get(userId); - if (services == null) return null; - return services.getStandardLayoutKey(pkg); - } - } - - @Override - public ArraySet<Integer> getAppOps(int userId, String pkg) { - synchronized (mMutex) { - final UserServices services = mUserServices.get(userId); - if (services == null) { - return null; - } - return services.getFeatures(pkg); - } - } - - @Override - public void onAppOpChanged(int code, int uid, String packageName, boolean active) { - int userId = UserHandle.getUserId(uid); - synchronized (mMutex) { - UserServices userServices = mUserServices.get(userId); - if (userServices == null) { - userServices = new UserServices(); - mUserServices.put(userId, userServices); - } - if (active) { - userServices.addOp(packageName, code); - } else { - userServices.removeOp(packageName, code); - } - } - } - - @Override - public void addNotification(StatusBarNotification sbn, int importance) { - updateNotification(sbn, importance); - } - - @Override - public boolean removeNotification(StatusBarNotification sbn) { - synchronized (mMutex) { - final UserServices userServices = mUserServices.get(sbn.getUserId()); - if (userServices == null) { - if (DBG) { - Log.w(TAG, String.format( - "user %d with no known notifications got removeNotification for %s", - sbn.getUserId(), sbn)); - } - return false; - } - if (isDungeonNotification(sbn)) { - // if you remove the dungeon entirely, we take that to mean there are - // no running services - userServices.setRunningServices(null, 0); - return true; - } else { - // this is safe to call on any notification, not just FLAG_FOREGROUND_SERVICE - return userServices.removeNotification(sbn.getPackageName(), sbn.getKey()); - } - } - } - - @Override - public void updateNotification(StatusBarNotification sbn, int newImportance) { - synchronized (mMutex) { - UserServices userServices = mUserServices.get(sbn.getUserId()); - if (userServices == null) { - userServices = new UserServices(); - mUserServices.put(sbn.getUserId(), userServices); - } - - if (isDungeonNotification(sbn)) { - final Bundle extras = sbn.getNotification().extras; - if (extras != null) { - final String[] svcs = extras.getStringArray(Notification.EXTRA_FOREGROUND_APPS); - userServices.setRunningServices(svcs, sbn.getNotification().when); - } - } else { - userServices.removeNotification(sbn.getPackageName(), sbn.getKey()); - if (0 != (sbn.getNotification().flags & Notification.FLAG_FOREGROUND_SERVICE)) { - if (newImportance > NotificationManager.IMPORTANCE_MIN) { - userServices.addImportantNotification(sbn.getPackageName(), sbn.getKey()); - } - final Notification.Builder builder = Notification.Builder.recoverBuilder( - mContext, sbn.getNotification()); - if (builder.usesStandardHeader()) { - userServices.addStandardLayoutNotification( - sbn.getPackageName(), sbn.getKey()); - } - } - } - } - } - - @Override - public boolean isDungeonNotification(StatusBarNotification sbn) { - return sbn.getId() == SystemMessageProto.SystemMessage.NOTE_FOREGROUND_SERVICES - && sbn.getTag() == null - && sbn.getPackageName().equals("android"); - } - - @Override - public boolean isSystemAlertNotification(StatusBarNotification sbn) { - return sbn.getPackageName().equals("android") - && sbn.getTag() != null - && sbn.getTag().contains("AlertWindowNotification"); - } - - /** - * Struct to track relevant packages and notifications for a userid's foreground services. - */ - private static class UserServices { - private String[] mRunning = null; - private long mServiceStartTime = 0; - // package -> sufficiently important posted notification keys - private ArrayMap<String, ArraySet<String>> mImportantNotifications = new ArrayMap<>(1); - // package -> standard layout posted notification keys - private ArrayMap<String, ArraySet<String>> mStandardLayoutNotifications = new ArrayMap<>(1); - - // package -> app ops - private ArrayMap<String, ArraySet<Integer>> mAppOps = new ArrayMap<>(1); - - public void setRunningServices(String[] pkgs, long serviceStartTime) { - mRunning = pkgs != null ? Arrays.copyOf(pkgs, pkgs.length) : null; - mServiceStartTime = serviceStartTime; - } - - public void addOp(String pkg, int op) { - if (mAppOps.get(pkg) == null) { - mAppOps.put(pkg, new ArraySet<>(3)); - } - mAppOps.get(pkg).add(op); - } - - public boolean removeOp(String pkg, int op) { - final boolean found; - final ArraySet<Integer> keys = mAppOps.get(pkg); - if (keys == null) { - found = false; - } else { - found = keys.remove(op); - if (keys.size() == 0) { - mAppOps.remove(pkg); - } - } - return found; - } - - public void addImportantNotification(String pkg, String key) { - addNotification(mImportantNotifications, pkg, key); - } - - public boolean removeImportantNotification(String pkg, String key) { - return removeNotification(mImportantNotifications, pkg, key); - } - - public void addStandardLayoutNotification(String pkg, String key) { - addNotification(mStandardLayoutNotifications, pkg, key); - } - - public boolean removeStandardLayoutNotification(String pkg, String key) { - return removeNotification(mStandardLayoutNotifications, pkg, key); - } - - public boolean removeNotification(String pkg, String key) { - boolean removed = false; - removed |= removeImportantNotification(pkg, key); - removed |= removeStandardLayoutNotification(pkg, key); - return removed; - } - - public void addNotification(ArrayMap<String, ArraySet<String>> map, String pkg, - String key) { - if (map.get(pkg) == null) { - map.put(pkg, new ArraySet<>()); - } - map.get(pkg).add(key); - } - - public boolean removeNotification(ArrayMap<String, ArraySet<String>> map, - String pkg, String key) { - final boolean found; - final ArraySet<String> keys = map.get(pkg); - if (keys == null) { - found = false; - } else { - found = keys.remove(key); - if (keys.size() == 0) { - map.remove(pkg); - } - } - return found; - } - - public boolean isDungeonNeeded() { - if (mRunning != null - && System.currentTimeMillis() - mServiceStartTime >= FG_SERVICE_GRACE_MILLIS) { - - for (String pkg : mRunning) { - final ArraySet<String> set = mImportantNotifications.get(pkg); - if (set == null || set.size() == 0) { - return true; - } - } - } - return false; - } - - public ArraySet<Integer> getFeatures(String pkg) { - return mAppOps.get(pkg); - } - - public String getStandardLayoutKey(String pkg) { - final ArraySet<String> set = mStandardLayoutNotifications.get(pkg); - if (set == null || set.size() == 0) { - return null; - } - return set.valueAt(0); - } - - @Override - public String toString() { - return "UserServices{" + - "mRunning=" + Arrays.toString(mRunning) + - ", mServiceStartTime=" + mServiceStartTime + - ", mImportantNotifications=" + mImportantNotifications + - ", mStandardLayoutNotifications=" + mStandardLayoutNotifications + - '}'; - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java new file mode 100644 index 000000000000..b0b7e6c88984 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java @@ -0,0 +1,147 @@ +/* + * 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.systemui; + +import android.app.Notification; +import android.app.NotificationManager; +import android.content.Context; +import android.os.Bundle; +import android.service.notification.StatusBarNotification; +import android.util.Log; + +import com.android.internal.statusbar.NotificationVisibility; +import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.NotificationEntryListener; +import com.android.systemui.statusbar.notification.NotificationEntryManager; + +import javax.inject.Inject; +import javax.inject.Singleton; + +/** Updates foreground service notification state in response to notification data events. */ +@Singleton +public class ForegroundServiceNotificationListener { + + private static final String TAG = "FgServiceController"; + private static final boolean DBG = false; + + private final Context mContext; + private final ForegroundServiceController mForegroundServiceController; + + @Inject + public ForegroundServiceNotificationListener(Context context, + ForegroundServiceController foregroundServiceController, + NotificationEntryManager notificationEntryManager) { + mContext = context; + mForegroundServiceController = foregroundServiceController; + notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() { + @Override + public void onPendingEntryAdded(NotificationData.Entry entry) { + addNotification(entry.notification, entry.importance); + } + + @Override + public void onEntryUpdated(NotificationData.Entry entry) { + updateNotification(entry.notification, entry.importance); + } + + @Override + public void onEntryRemoved( + NotificationData.Entry entry, + NotificationVisibility visibility, + boolean removedByUser) { + removeNotification(entry.notification); + } + }); + } + + /** + * @param sbn notification that was just posted + */ + private void addNotification(StatusBarNotification sbn, int importance) { + updateNotification(sbn, importance); + } + + /** + * @param sbn notification that was just removed + */ + private void removeNotification(StatusBarNotification sbn) { + mForegroundServiceController.updateUserState( + sbn.getUserId(), + new ForegroundServiceController.UserStateUpdateCallback() { + @Override + public boolean updateUserState(ForegroundServicesUserState userState) { + if (mForegroundServiceController.isDisclosureNotification(sbn)) { + // if you remove the dungeon entirely, we take that to mean there are + // no running services + userState.setRunningServices(null, 0); + return true; + } else { + // this is safe to call on any notification, not just + // FLAG_FOREGROUND_SERVICE + return userState.removeNotification(sbn.getPackageName(), sbn.getKey()); + } + } + + @Override + public void userStateNotFound(int userId) { + if (DBG) { + Log.w(TAG, String.format( + "user %d with no known notifications got removeNotification " + + "for %s", + sbn.getUserId(), sbn)); + } + } + }, + false /* don't create */); + } + + /** + * @param sbn notification that was just changed in some way + */ + private void updateNotification(StatusBarNotification sbn, int newImportance) { + mForegroundServiceController.updateUserState( + sbn.getUserId(), + userState -> { + if (mForegroundServiceController.isDisclosureNotification(sbn)) { + final Bundle extras = sbn.getNotification().extras; + if (extras != null) { + final String[] svcs = extras.getStringArray( + Notification.EXTRA_FOREGROUND_APPS); + userState.setRunningServices(svcs, sbn.getNotification().when); + } + } else { + userState.removeNotification(sbn.getPackageName(), sbn.getKey()); + if (0 != (sbn.getNotification().flags + & Notification.FLAG_FOREGROUND_SERVICE)) { + if (newImportance > NotificationManager.IMPORTANCE_MIN) { + userState.addImportantNotification(sbn.getPackageName(), + sbn.getKey()); + } + final Notification.Builder builder = + Notification.Builder.recoverBuilder( + mContext, sbn.getNotification()); + if (builder.usesStandardHeader()) { + userState.addStandardLayoutNotification( + sbn.getPackageName(), sbn.getKey()); + } + } + } + return true; + }, + true /* create if not found */); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServicesUserState.java b/packages/SystemUI/src/com/android/systemui/ForegroundServicesUserState.java new file mode 100644 index 000000000000..a8ae65490b28 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServicesUserState.java @@ -0,0 +1,149 @@ +/* + * 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.systemui; + +import android.util.ArrayMap; +import android.util.ArraySet; + +import java.util.Arrays; + +/** + * Struct to track relevant packages and notifications for a userid's foreground services. + */ +class ForegroundServicesUserState { + // shelf life of foreground services before they go bad + private static final long FG_SERVICE_GRACE_MILLIS = 5000; + + private String[] mRunning = null; + private long mServiceStartTime = 0; + // package -> sufficiently important posted notification keys + private ArrayMap<String, ArraySet<String>> mImportantNotifications = new ArrayMap<>(1); + // package -> standard layout posted notification keys + private ArrayMap<String, ArraySet<String>> mStandardLayoutNotifications = new ArrayMap<>(1); + + // package -> app ops + private ArrayMap<String, ArraySet<Integer>> mAppOps = new ArrayMap<>(1); + + public void setRunningServices(String[] pkgs, long serviceStartTime) { + mRunning = pkgs != null ? Arrays.copyOf(pkgs, pkgs.length) : null; + mServiceStartTime = serviceStartTime; + } + + public void addOp(String pkg, int op) { + if (mAppOps.get(pkg) == null) { + mAppOps.put(pkg, new ArraySet<>(3)); + } + mAppOps.get(pkg).add(op); + } + + public boolean removeOp(String pkg, int op) { + final boolean found; + final ArraySet<Integer> keys = mAppOps.get(pkg); + if (keys == null) { + found = false; + } else { + found = keys.remove(op); + if (keys.size() == 0) { + mAppOps.remove(pkg); + } + } + return found; + } + + public void addImportantNotification(String pkg, String key) { + addNotification(mImportantNotifications, pkg, key); + } + + public boolean removeImportantNotification(String pkg, String key) { + return removeNotification(mImportantNotifications, pkg, key); + } + + public void addStandardLayoutNotification(String pkg, String key) { + addNotification(mStandardLayoutNotifications, pkg, key); + } + + public boolean removeStandardLayoutNotification(String pkg, String key) { + return removeNotification(mStandardLayoutNotifications, pkg, key); + } + + public boolean removeNotification(String pkg, String key) { + boolean removed = false; + removed |= removeImportantNotification(pkg, key); + removed |= removeStandardLayoutNotification(pkg, key); + return removed; + } + + public void addNotification(ArrayMap<String, ArraySet<String>> map, String pkg, + String key) { + if (map.get(pkg) == null) { + map.put(pkg, new ArraySet<>()); + } + map.get(pkg).add(key); + } + + public boolean removeNotification(ArrayMap<String, ArraySet<String>> map, + String pkg, String key) { + final boolean found; + final ArraySet<String> keys = map.get(pkg); + if (keys == null) { + found = false; + } else { + found = keys.remove(key); + if (keys.size() == 0) { + map.remove(pkg); + } + } + return found; + } + + public boolean isDisclosureNeeded() { + if (mRunning != null + && System.currentTimeMillis() - mServiceStartTime + >= FG_SERVICE_GRACE_MILLIS) { + + for (String pkg : mRunning) { + final ArraySet<String> set = mImportantNotifications.get(pkg); + if (set == null || set.size() == 0) { + return true; + } + } + } + return false; + } + + public ArraySet<Integer> getFeatures(String pkg) { + return mAppOps.get(pkg); + } + + public String getStandardLayoutKey(String pkg) { + final ArraySet<String> set = mStandardLayoutNotifications.get(pkg); + if (set == null || set.size() == 0) { + return null; + } + return set.valueAt(0); + } + + @Override + public String toString() { + return "UserServices{" + + "mRunning=" + Arrays.toString(mRunning) + + ", mServiceStartTime=" + mServiceStartTime + + ", mImportantNotifications=" + mImportantNotifications + + ", mStandardLayoutNotifications=" + mStandardLayoutNotifications + + '}'; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index 1dd231ca7642..ab077d636beb 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -329,11 +329,11 @@ public class ScreenDecorations extends SystemUI implements Tunable { private void updateRoundedCornerRadii() { final int newRoundedDefault = mContext.getResources().getDimensionPixelSize( - R.dimen.rounded_corner_radius); + com.android.internal.R.dimen.rounded_corner_radius); final int newRoundedDefaultTop = mContext.getResources().getDimensionPixelSize( - R.dimen.rounded_corner_radius_top); + com.android.internal.R.dimen.rounded_corner_radius_top); final int newRoundedDefaultBottom = mContext.getResources().getDimensionPixelSize( - R.dimen.rounded_corner_radius_bottom); + com.android.internal.R.dimen.rounded_corner_radius_bottom); final boolean roundedCornersChanged = mRoundedDefault != newRoundedDefault || mRoundedDefaultBottom != newRoundedDefaultBottom diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index e3bfdc911941..5347a5cb16b6 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -16,6 +16,7 @@ package com.android.systemui; +import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME; import android.annotation.Nullable; @@ -50,6 +51,7 @@ import com.android.systemui.statusbar.phone.LockscreenWallpaper; import com.android.systemui.statusbar.phone.NotificationIconAreaController; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.ScrimState; +import com.android.systemui.statusbar.phone.ShadeController; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.policy.DeviceProvisionedController; @@ -200,6 +202,19 @@ public class SystemUIFactory { return new NotificationInterruptionStateProvider(context); } + @Singleton + @Provides + @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) + public boolean provideAllowNotificationLongPress() { + return true; + } + + @Singleton + @Provides + public ShadeController provideShadeController(Context context) { + return SysUiServiceProvider.getComponent(context, StatusBar.class); + } + @Module protected static class ContextHolder { private Context mContext; diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java index ba89fe662a65..3167b9e0a458 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java @@ -240,7 +240,10 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba mConfirmShowing = true; mCurrentDialog.showConfirmationButton(true /* show */); } else { - handleHideDialog(false /* userCanceled */); + mCurrentDialog.updateState(BiometricDialogView.STATE_AUTHENTICATED); + mHandler.postDelayed(() -> { + handleHideDialog(false /* userCanceled */); + }, mCurrentDialog.getDelayAfterAuthenticatedDurationMs()); } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java index e085f2368214..9934bfd11f12 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.PixelFormat; import android.graphics.PorterDuff; +import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.Drawable; import android.hardware.biometrics.BiometricPrompt; import android.os.Binder; @@ -63,7 +64,8 @@ public abstract class BiometricDialogView extends LinearLayout { protected static final int STATE_NONE = 0; protected static final int STATE_AUTHENTICATING = 1; protected static final int STATE_ERROR = 2; - protected static final int STATE_AUTHENTICATED = 3; + protected static final int STATE_PENDING_CONFIRMATION = 3; + protected static final int STATE_AUTHENTICATED = 4; private final IBinder mWindowToken = new Binder(); private final Interpolator mLinearOutSlowIn; @@ -77,6 +79,8 @@ public abstract class BiometricDialogView extends LinearLayout { private final DialogViewCallback mCallback; private ViewGroup mLayout; + private final Button mPositiveButton; + private final Button mNegativeButton; private final TextView mErrorText; private Bundle mBundle; private final LinearLayout mDialog; @@ -90,10 +94,12 @@ public abstract class BiometricDialogView extends LinearLayout { private boolean mPendingShowTryAgain; private boolean mPendingShowConfirm; - protected abstract void updateIcon(int lastState, int newState); protected abstract int getHintStringResourceId(); protected abstract int getAuthenticatedAccessibilityResourceId(); protected abstract int getIconDescriptionResourceId(); + protected abstract Drawable getAnimationForTransition(int oldState, int newState); + protected abstract boolean shouldAnimateForTransition(int oldState, int newState); + protected abstract int getDelayAfterAuthenticatedDurationMs(); private final Runnable mShowAnimationRunnable = new Runnable() { @Override @@ -178,10 +184,10 @@ public abstract class BiometricDialogView extends LinearLayout { final View space = mLayout.findViewById(R.id.space); final View leftSpace = mLayout.findViewById(R.id.left_space); final View rightSpace = mLayout.findViewById(R.id.right_space); - final Button negative = mLayout.findViewById(R.id.button2); - final Button positive = mLayout.findViewById(R.id.button1); final ImageView icon = mLayout.findViewById(R.id.biometric_icon); final Button tryAgain = mLayout.findViewById(R.id.button_try_again); + mNegativeButton = mLayout.findViewById(R.id.button2); + mPositiveButton = mLayout.findViewById(R.id.button1); icon.setContentDescription(getResources().getString(getIconDescriptionResourceId())); @@ -189,12 +195,15 @@ public abstract class BiometricDialogView extends LinearLayout { setDismissesDialog(leftSpace); setDismissesDialog(rightSpace); - negative.setOnClickListener((View v) -> { + mNegativeButton.setOnClickListener((View v) -> { mCallback.onNegativePressed(); }); - positive.setOnClickListener((View v) -> { - mCallback.onPositivePressed(); + mPositiveButton.setOnClickListener((View v) -> { + updateState(STATE_AUTHENTICATED); + mHandler.postDelayed(() -> { + mCallback.onPositivePressed(); + }, getDelayAfterAuthenticatedDurationMs()); }); tryAgain.setOnClickListener((View v) -> { @@ -215,7 +224,6 @@ public abstract class BiometricDialogView extends LinearLayout { final TextView title = mLayout.findViewById(R.id.title); final TextView subtitle = mLayout.findViewById(R.id.subtitle); final TextView description = mLayout.findViewById(R.id.description); - final Button negative = mLayout.findViewById(R.id.button2); final ImageView backgroundView = mLayout.findViewById(R.id.background); if (mUserManager.isManagedProfile(mUserId)) { @@ -229,6 +237,9 @@ public abstract class BiometricDialogView extends LinearLayout { backgroundView.setBackgroundColor(R.color.biometric_dialog_dim_color); } + mNegativeButton.setVisibility(View.VISIBLE); + mErrorText.setVisibility(View.VISIBLE); + if (RotationUtils.getRotation(mContext) != RotationUtils.ROTATION_NONE) { mDialog.getLayoutParams().width = (int) mDialogWidth; } @@ -258,7 +269,7 @@ public abstract class BiometricDialogView extends LinearLayout { description.setText(descriptionText); } - negative.setText(mBundle.getCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT)); + mNegativeButton.setText(mBundle.getCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT)); showTryAgainButton(mPendingShowTryAgain); showConfirmationButton(mPendingShowConfirm); @@ -280,10 +291,32 @@ public abstract class BiometricDialogView extends LinearLayout { mSkipIntro = false; } + protected void updateIcon(int lastState, int newState) { + final Drawable icon = getAnimationForTransition(lastState, newState); + if (icon == null) { + Log.e(TAG, "Animation not found"); + return; + } + + final AnimatedVectorDrawable animation = icon instanceof AnimatedVectorDrawable + ? (AnimatedVectorDrawable) icon + : null; + + final ImageView imageView = getLayout().findViewById(R.id.biometric_icon); + imageView.setImageDrawable(icon); + + if (animation != null && shouldAnimateForTransition(lastState, newState)) { + animation.forceAnimationOnUI(); + animation.start(); + } + } + private void setDismissesDialog(View v) { v.setClickable(true); v.setOnTouchListener((View view, MotionEvent event) -> { - mCallback.onUserCanceled(); + if (mLastState != STATE_AUTHENTICATED) { + mCallback.onUserCanceled(); + } return true; }); } @@ -302,6 +335,7 @@ public abstract class BiometricDialogView extends LinearLayout { showTryAgainButton(false /* show */); mPendingShowTryAgain = false; mPendingShowConfirm = false; + updateState(STATE_NONE); } }; @@ -362,11 +396,11 @@ public abstract class BiometricDialogView extends LinearLayout { } public void showConfirmationButton(boolean show) { - final Button positive = mLayout.findViewById(R.id.button1); if (show) { - positive.setVisibility(View.VISIBLE); + updateState(STATE_PENDING_CONFIRMATION); + mPositiveButton.setVisibility(View.VISIBLE); } else { - positive.setVisibility(View.GONE); + mPositiveButton.setVisibility(View.GONE); } } @@ -411,7 +445,15 @@ public abstract class BiometricDialogView extends LinearLayout { mCallback.onErrorShown(); } - private void updateState(int newState) { + public void updateState(int newState) { + if (newState == STATE_PENDING_CONFIRMATION) { + mErrorText.setVisibility(View.INVISIBLE); + } else if (newState == STATE_AUTHENTICATED) { + mPositiveButton.setVisibility(View.GONE); + mNegativeButton.setVisibility(View.GONE); + mErrorText.setVisibility(View.INVISIBLE); + } + updateIcon(mLastState, newState); mLastState = newState; } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java index feef3a6dc133..de3f9471a6ba 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java @@ -18,16 +18,18 @@ package com.android.systemui.biometrics; import android.content.Context; import android.graphics.drawable.Drawable; -import android.widget.ImageView; import com.android.systemui.R; /** * This class loads the view for the system-provided dialog. The view consists of: - * Application Icon, Title, Subtitle, Description, Fingerprint Icon, Error/Help message area, + * Application Icon, Title, Subtitle, Description, Biometric Icon, Error/Help message area, * and positive/negative buttons. */ public class FaceDialogView extends BiometricDialogView { + + private static final int HIDE_DIALOG_DELAY = 500; // ms + public FaceDialogView(Context context, DialogViewCallback callback) { super(context, callback); @@ -53,10 +55,46 @@ public class FaceDialogView extends BiometricDialogView { } @Override - protected void updateIcon(int lastState, int newState) { - Drawable icon = mContext.getDrawable(R.drawable.face_dialog_icon); + protected boolean shouldAnimateForTransition(int oldState, int newState) { + if (oldState == STATE_NONE && newState == STATE_AUTHENTICATING) { + return false; + } else if (oldState == STATE_AUTHENTICATING && newState == STATE_ERROR) { + return true; + } else if (oldState == STATE_ERROR && newState == STATE_AUTHENTICATING) { + return true; + } else if (oldState == STATE_AUTHENTICATING && newState == STATE_PENDING_CONFIRMATION) { + return true; + } else if (oldState == STATE_PENDING_CONFIRMATION && newState == STATE_AUTHENTICATED) { + return true; + } else if (oldState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) { + return true; + } + return false; + } + + @Override + protected int getDelayAfterAuthenticatedDurationMs() { + return HIDE_DIALOG_DELAY; + } - final ImageView faceIcon = getLayout().findViewById(R.id.biometric_icon); - faceIcon.setImageDrawable(icon); + @Override + protected Drawable getAnimationForTransition(int oldState, int newState) { + int iconRes; + if (oldState == STATE_NONE && newState == STATE_AUTHENTICATING) { + iconRes = R.drawable.face_dialog_face_to_error; + } else if (oldState == STATE_AUTHENTICATING && newState == STATE_ERROR) { + iconRes = R.drawable.face_dialog_face_to_error; + } else if (oldState == STATE_ERROR && newState == STATE_AUTHENTICATING) { + iconRes = R.drawable.face_dialog_error_to_face; + } else if (oldState == STATE_AUTHENTICATING && newState == STATE_PENDING_CONFIRMATION) { + iconRes = R.drawable.face_dialog_face_gray_to_face_blue; + } else if (oldState == STATE_PENDING_CONFIRMATION && newState == STATE_AUTHENTICATED) { + iconRes = R.drawable.face_dialog_face_blue_to_checkmark; + } else if (oldState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) { + iconRes = R.drawable.face_dialog_face_gray_to_checkmark; + } else { + return null; + } + return mContext.getDrawable(iconRes); } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java index 38a69a90f0bb..1a6cee281c84 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java @@ -17,21 +17,21 @@ package com.android.systemui.biometrics; import android.content.Context; -import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.Drawable; -import android.util.Log; -import android.widget.ImageView; import com.android.systemui.R; /** * This class loads the view for the system-provided dialog. The view consists of: - * Application Icon, Title, Subtitle, Description, Fingerprint Icon, Error/Help message area, + * Application Icon, Title, Subtitle, Description, Biometric Icon, Error/Help message area, * and positive/negative buttons. */ public class FingerprintDialogView extends BiometricDialogView { - private static final String TAG = "FingerprintDialogView"; + public FingerprintDialogView(Context context, + DialogViewCallback callback) { + super(context, callback); + } @Override protected int getHintStringResourceId() { return R.string.fingerprint_dialog_touch_sensor; @@ -48,33 +48,7 @@ public class FingerprintDialogView extends BiometricDialogView { } @Override - protected void updateIcon(int lastState, int newState) { - Drawable icon = getAnimationForTransition(lastState, newState); - - if (icon == null) { - Log.e(TAG, "Animation not found"); - return; - } - - final AnimatedVectorDrawable animation = icon instanceof AnimatedVectorDrawable - ? (AnimatedVectorDrawable) icon - : null; - - final ImageView fingerprintIcon = getLayout().findViewById(R.id.biometric_icon); - fingerprintIcon.setImageDrawable(icon); - - if (animation != null && shouldAnimateForTransition(lastState, newState)) { - animation.forceAnimationOnUI(); - animation.start(); - } - } - - public FingerprintDialogView(Context context, - DialogViewCallback callback) { - super(context, callback); - } - - private boolean shouldAnimateForTransition(int oldState, int newState) { + protected boolean shouldAnimateForTransition(int oldState, int newState) { if (oldState == STATE_NONE && newState == STATE_AUTHENTICATING) { return false; } else if (oldState == STATE_AUTHENTICATING && newState == STATE_ERROR) { @@ -88,7 +62,13 @@ public class FingerprintDialogView extends BiometricDialogView { return false; } - private Drawable getAnimationForTransition(int oldState, int newState) { + @Override + protected int getDelayAfterAuthenticatedDurationMs() { + return 0; + } + + @Override + protected Drawable getAnimationForTransition(int oldState, int newState) { int iconRes; if (oldState == STATE_NONE && newState == STATE_AUTHENTICATING) { iconRes = R.drawable.fingerprint_dialog_fp_to_error; @@ -98,7 +78,7 @@ public class FingerprintDialogView extends BiometricDialogView { iconRes = R.drawable.fingerprint_dialog_error_to_fp; } else if (oldState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) { // TODO(b/77328470): add animation when fingerprint is authenticated - iconRes = R.drawable.fingerprint_dialog_error_to_fp; + iconRes = R.drawable.fingerprint_dialog_fp_to_error; } else { return null; } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index 881aa18285ff..644723321103 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -33,8 +33,11 @@ import android.view.WindowManager; import android.widget.FrameLayout; import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.NotificationEntryListener; +import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.phone.StatusBarWindowController; import java.util.ArrayList; @@ -57,47 +60,31 @@ public class BubbleController { private static final String TAG = "BubbleController"; // Enables some subset of notifs to automatically become bubbles - public static final boolean DEBUG_ENABLE_AUTO_BUBBLE = false; + private static final boolean DEBUG_ENABLE_AUTO_BUBBLE = false; // When a bubble is dismissed, recreate it as a notification - public static final boolean DEBUG_DEMOTE_TO_NOTIF = false; + private static final boolean DEBUG_DEMOTE_TO_NOTIF = false; // Secure settings private static final String ENABLE_AUTO_BUBBLE_MESSAGES = "experiment_autobubble_messaging"; private static final String ENABLE_AUTO_BUBBLE_ONGOING = "experiment_autobubble_ongoing"; private static final String ENABLE_AUTO_BUBBLE_ALL = "experiment_autobubble_all"; - private Context mContext; - private BubbleDismissListener mDismissListener; + private final Context mContext; + private final NotificationEntryManager mNotificationEntryManager; private BubbleStateChangeListener mStateChangeListener; private BubbleExpandListener mExpandListener; - private Map<String, BubbleView> mBubbles = new HashMap<>(); + private final Map<String, BubbleView> mBubbles = new HashMap<>(); private BubbleStackView mStackView; - private Point mDisplaySize; + private final Point mDisplaySize; // Bubbles get added to the status bar view - @VisibleForTesting - protected StatusBarWindowController mStatusBarWindowController; + private final StatusBarWindowController mStatusBarWindowController; // Used for determining view rect for touch interaction private Rect mTempRect = new Rect(); /** - * Listener to find out about bubble / bubble stack dismissal events. - */ - public interface BubbleDismissListener { - /** - * Called when the entire stack of bubbles is dismissed by the user. - */ - void onStackDismissed(); - - /** - * Called when a specific bubble is dismissed by the user. - */ - void onBubbleDismissed(String key); - } - - /** * Listener to be notified when some states of the bubbles change. */ public interface BubbleStateChangeListener { @@ -123,17 +110,13 @@ public class BubbleController { @Inject public BubbleController(Context context, StatusBarWindowController statusBarWindowController) { mContext = context; + mNotificationEntryManager = Dependency.get(NotificationEntryManager.class); WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); mDisplaySize = new Point(); wm.getDefaultDisplay().getSize(mDisplaySize); mStatusBarWindowController = statusBarWindowController; - } - /** - * Set a listener to be notified of bubble dismissal events. - */ - public void setDismissListener(BubbleDismissListener listener) { - mDismissListener = listener; + mNotificationEntryManager.addNotificationEntryListener(mEntryListener); } /** @@ -180,7 +163,7 @@ public class BubbleController { /** * Tell the stack of bubbles to be dismissed, this will remove all of the bubbles in the stack. */ - public void dismissStack() { + void dismissStack() { if (mStackView == null) { return; } @@ -190,9 +173,7 @@ public class BubbleController { for (String key: mBubbles.keySet()) { removeBubble(key); } - if (mDismissListener != null) { - mDismissListener.onStackDismissed(); - } + mNotificationEntryManager.updateNotifications(); updateBubblesShowing(); } @@ -238,18 +219,35 @@ public class BubbleController { /** * Removes the bubble associated with the {@param uri}. */ - public void removeBubble(String key) { + void removeBubble(String key) { BubbleView bv = mBubbles.get(key); if (mStackView != null && bv != null) { mStackView.removeBubble(bv); bv.getEntry().setBubbleDismissed(true); } - if (mDismissListener != null) { - mDismissListener.onBubbleDismissed(key); + + NotificationData.Entry entry = mNotificationEntryManager.getNotificationData().get(key); + if (entry != null) { + entry.setBubbleDismissed(true); + if (!DEBUG_DEMOTE_TO_NOTIF) { + mNotificationEntryManager.performRemoveNotification(entry.notification); + } } + mNotificationEntryManager.updateNotifications(); + updateBubblesShowing(); } + @SuppressWarnings("FieldCanBeLocal") + private final NotificationEntryListener mEntryListener = new NotificationEntryListener() { + @Override + public void onPendingEntryAdded(NotificationData.Entry entry) { + if (shouldAutoBubble(mContext, entry)) { + entry.setIsBubble(true); + } + } + }; + private void updateBubblesShowing() { boolean hasBubblesShowing = false; for (BubbleView bv : mBubbles.values()) { @@ -309,7 +307,7 @@ public class BubbleController { } @VisibleForTesting - public BubbleStackView getStackView() { + BubbleStackView getStackView() { return mStackView; } @@ -317,7 +315,7 @@ public class BubbleController { /** * Gets an appropriate starting point to position the bubble stack. */ - public static Point getStartPoint(int size, Point displaySize) { + private static Point getStartPoint(int size, Point displaySize) { final int x = displaySize.x - size + EDGE_OVERLAP; final int y = displaySize.y / 4; return new Point(x, y); @@ -326,7 +324,7 @@ public class BubbleController { /** * Gets an appropriate position for the bubble when the stack is expanded. */ - public static Point getExpandPoint(BubbleStackView view, int size, Point displaySize) { + static Point getExpandPoint(BubbleStackView view, int size, Point displaySize) { // Same place for now.. return new Point(EDGE_OVERLAP, size); } @@ -334,7 +332,7 @@ public class BubbleController { /** * Whether the notification should bubble or not. */ - public static boolean shouldAutoBubble(Context context, NotificationData.Entry entry) { + private static boolean shouldAutoBubble(Context context, NotificationData.Entry entry) { if (entry.isBubbleDismissed()) { return false; } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index 04362c17141c..b6fc35553760 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -85,6 +85,7 @@ public class DozeSensors { mProxCallback = proxCallback; mResolver = mContext.getContentResolver(); + boolean alwaysOn = mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT); mSensors = new TriggerSensor[] { new TriggerSensor( mSensorManager.getDefaultSensor(Sensor.TYPE_SIGNIFICANT_MOTION), @@ -116,7 +117,7 @@ public class DozeSensors { new PluginSensor( new SensorManagerPlugin.Sensor(TYPE_WAKE_DISPLAY), Settings.Secure.DOZE_WAKE_SCREEN_GESTURE, - mConfig.wakeScreenGestureAvailable(), + mConfig.wakeScreenGestureAvailable() && alwaysOn, DozeLog.REASON_SENSOR_WAKE_UP, false /* reports touch coordinates */, false /* touchscreen */), diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java index 67aa82dc9688..76565649dd69 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java @@ -124,6 +124,7 @@ public class DozeUi implements DozeMachine.Part { unscheduleTimeTick(); break; case DOZE_REQUEST_PULSE: + scheduleTimeTick(); pulseWhileDozing(mMachine.getPulseReason()); break; case INITIALIZED: diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java index dc11b4c63d83..19a7ceaaaac3 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java @@ -132,9 +132,9 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks } @Override - public void disable(int state1, int state2, boolean animate) { + public void disable(int displayId, int state1, int state2, boolean animate) { final boolean disabled = (state2 & DISABLE2_GLOBAL_ACTIONS) != 0; - if (disabled == mDisabled) return; + if (displayId != mContext.getDisplayId() || disabled == mDisabled) return; mDisabled = disabled; if (disabled && mGlobalActions != null) { mGlobalActions.dismissDialog(); diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt index 3991c19e4d05..01ee5cabe5a0 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt @@ -50,6 +50,7 @@ class OngoingPrivacyDialog constructor( object : DialogInterface.OnClickListener { val intent = Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE) + @Suppress("DEPRECATION") override fun onClick(dialog: DialogInterface?, which: Int) { Dependency.get(ActivityStarter::class.java).startActivity(intent, false) } diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt index d5b807def21f..b218e80693b1 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt @@ -46,10 +46,13 @@ class PrivacyItemController(val context: Context, val callback: Callback) { } private var privacyList = emptyList<PrivacyItem>() + @Suppress("DEPRECATION") private val appOpsController = Dependency.get(AppOpsController::class.java) private val userManager = context.getSystemService(UserManager::class.java) private var currentUserIds = emptyList<Int>() + @Suppress("DEPRECATION") private val bgHandler = Handler(Dependency.get(Dependency.BG_LOOPER)) + @Suppress("DEPRECATION") private val uiHandler = Dependency.get(Dependency.MAIN_HANDLER) private var listening = false val systemApp = PrivacyApplication(context.getString(R.string.device_services), context) diff --git a/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java b/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java index dfd3f735dfaa..2365e67fec2f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java +++ b/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java @@ -35,6 +35,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import javax.inject.Inject; + public class AutoAddTracker { private static final String[][] CONVERT_PREFS = { @@ -48,6 +50,7 @@ public class AutoAddTracker { private final ArraySet<String> mAutoAdded; private final Context mContext; + @Inject public AutoAddTracker(Context context) { mContext = context; mAutoAdded = new ArraySet<>(getAdded()); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 34d30fe58404..087a826844e2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -215,7 +215,10 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca } @Override - public void disable(int state1, int state2, boolean animate) { + public void disable(int displayId, int state1, int state2, boolean animate) { + if (displayId != getContext().getDisplayId()) { + return; + } state2 = mRemoteInputQuickSettingsDisabler.adjustDisableFlags(state2); final boolean disabled = (state2 & DISABLE2_QUICK_SETTINGS) != 0; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java index 3a6b785eb9b5..dfc3e66d8d98 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java @@ -56,6 +56,7 @@ import java.util.function.Predicate; import javax.inject.Inject; import javax.inject.Named; +import javax.inject.Provider; import javax.inject.Singleton; /** Platform implementation of the quick settings tile host **/ @@ -74,7 +75,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory> { private final PluginManager mPluginManager; private final List<Callback> mCallbacks = new ArrayList<>(); - private final AutoTileManager mAutoTiles; + private AutoTileManager mAutoTiles; private final StatusBarIconController mIconController; private final ArrayList<QSFactory> mQsFactories = new ArrayList<>(); private int mCurrentUser; @@ -87,7 +88,8 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory> { @Named(Dependency.MAIN_HANDLER_NAME) Handler mainHandler, @Named(Dependency.BG_LOOPER_NAME) Looper bgLooper, PluginManager pluginManager, - TunerService tunerService) { + TunerService tunerService, + Provider<AutoTileManager> autoTiles) { mIconController = iconController; mContext = context; mTunerService = tunerService; @@ -104,9 +106,9 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory> { // QSTileHost -> XXXTile -> QSTileHost. Posting ensures creation // finishes before creating any tiles. tunerService.addTunable(this, TILES_SETTING); + // AutoTileManager can modify mTiles so make sure mTiles has already been initialized. + mAutoTiles = autoTiles.get(); }); - // AutoTileManager can modify mTiles so make sure mTiles has already been initialized. - mAutoTiles = new AutoTileManager(context, this); } public StatusBarIconController getIconController() { @@ -264,7 +266,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory> { @Override public void unmarkTileAsAutoAdded(String spec) { - mAutoTiles.unmarkTileAsAutoAdded(spec); + if (mAutoTiles != null) mAutoTiles.unmarkTileAsAutoAdded(spec); } public void addTile(String spec) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index f13b565bd532..0fc4fe72bd54 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -54,8 +54,10 @@ public class Recents extends SystemUI implements CommandQueue.Callbacks { } @Override - public void appTransitionFinished() { - mImpl.onAppTransitionFinished(); + public void appTransitionFinished(int displayId) { + if (mContext.getDisplayId() == displayId) { + mImpl.onAppTransitionFinished(); + } } public void growRecents() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index 95019ee2aeea..6a015630a076 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -16,18 +16,30 @@ package com.android.systemui.statusbar; +import static android.app.StatusBarManager.DISABLE2_NONE; +import static android.app.StatusBarManager.DISABLE_NONE; +import static android.view.Display.DEFAULT_DISPLAY; + import static com.android.systemui.statusbar.phone.StatusBar.ONLY_CORE_APPS; import android.app.StatusBarManager; +import android.app.StatusBarManager.Disable2Flags; +import android.app.StatusBarManager.DisableFlags; +import android.app.StatusBarManager.WindowType; +import android.app.StatusBarManager.WindowVisibleState; import android.content.ComponentName; +import android.content.Context; import android.graphics.Rect; import android.hardware.biometrics.IBiometricServiceReceiverInternal; +import android.hardware.display.DisplayManager; +import android.inputmethodservice.InputMethodService.BackDispositionMode; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Message; import android.util.Pair; +import android.util.SparseArray; import androidx.annotation.VisibleForTesting; @@ -47,7 +59,8 @@ import java.util.ArrayList; * coalescing these calls so they don't stack up. For the calls * are coalesced, note that they are all idempotent. */ -public class CommandQueue extends IStatusBar.Stub implements CallbackController<Callbacks> { +public class CommandQueue extends IStatusBar.Stub implements CallbackController<Callbacks>, + DisplayManager.DisplayListener { private static final int INDEX_MASK = 0xffff; private static final int MSG_SHIFT = 16; private static final int MSG_MASK = 0xffff << MSG_SHIFT; @@ -112,8 +125,8 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< private final Object mLock = new Object(); private ArrayList<Callbacks> mCallbacks = new ArrayList<>(); private Handler mHandler = new H(Looper.getMainLooper()); - private int mDisable1; - private int mDisable2; + /** A map of display id - disable flag pair */ + private SparseArray<Pair<Integer, Integer>> mDisplayDisabled = new SparseArray<>(); /** * These methods are called back on the main thread. @@ -121,17 +134,63 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< public interface Callbacks { default void setIcon(String slot, StatusBarIcon icon) { } default void removeIcon(String slot) { } - default void disable(int state1, int state2, boolean animate) { } + + /** + * Called to notify that disable flags are updated. + * @see IStatusBar#disable(int, int, int). + * + * @param displayId The id of the display to notify. + * @param state1 The combination of following DISABLE_* flags: + * @param state2 The combination of following DISABLE2_* flags: + * @param animate {@code true} to show animations. + */ + default void disable(int displayId, @DisableFlags int state1, @Disable2Flags int state2, + boolean animate) { } default void animateExpandNotificationsPanel() { } default void animateCollapsePanels(int flags, boolean force) { } default void togglePanel() { } default void animateExpandSettingsPanel(String obj) { } - default void setSystemUiVisibility(int vis, int fullscreenStackVis, + + /** + * Called to notify visibility flag changes. + * @see IStatusBar#setSystemUiVisibility(int, int, int, int, int, Rect, Rect). + * + * @param displayId The id of the display to notify. + * @param vis The visibility flags except SYSTEM_UI_FLAG_LIGHT_STATUS_BAR which will + * be reported separately in fullscreenStackVis and dockedStackVis. + * @param fullscreenStackVis The flags which only apply in the region of the fullscreen + * stack, which is currently only SYSTEM_UI_FLAG_LIGHT_STATUS_BAR. + * @param dockedStackVis The flags that only apply in the region of the docked stack, which + * is currently only SYSTEM_UI_FLAG_LIGHT_STATUS_BAR. + * @param mask Which flags to change. + * @param fullscreenStackBounds The current bounds of the fullscreen stack, in screen + * coordinates. + * @param dockedStackBounds The current bounds of the docked stack, in screen coordinates. + */ + default void setSystemUiVisibility(int displayId, int vis, int fullscreenStackVis, int dockedStackVis, int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) { } - default void topAppWindowChanged(boolean visible) { } - default void setImeWindowStatus(IBinder token, int vis, int backDisposition, - boolean showImeSwitcher) { } + + /** + * Called to notify top app window changes. + * @see IStatusBar#topAppWindowChanged(int, boolean) + * + * @param displayId The id of the display to notify. + * @param visible {@code true} to show menu button. + */ + default void topAppWindowChanged(int displayId, boolean visible) { } + + /** + * Called to notify IME window status changes. + * + * @param displayId The id of the display to notify. + * @param token IME token. + * @param vis IME visibility. + * @param backDisposition Disposition mode of back button. It should be one of below flags: + * @param showImeSwitcher {@code true} to show IME switch button. + */ + default void setImeWindowStatus(int displayId, IBinder token, int vis, + @BackDispositionMode int backDisposition, boolean showImeSwitcher) { } default void showRecentApps(boolean triggeredFromAltTab) { } default void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { } default void toggleRecentApps() { } @@ -140,12 +199,56 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< default void dismissKeyboardShortcutsMenu() { } default void toggleKeyboardShortcutsMenu(int deviceId) { } default void cancelPreloadRecentApps() { } - default void setWindowState(int window, int state) { } + + /** + * Called to notify window state changes. + * @see IStatusBar#setWindowState(int, int, int) + * + * @param displayId The id of the display to notify. + * @param window Window type. It should be one of {@link StatusBarManager#WINDOW_STATUS_BAR} + * or {@link StatusBarManager#WINDOW_NAVIGATION_BAR} + * @param state Window visible state. + */ + default void setWindowState(int displayId, @WindowType int window, + @WindowVisibleState int state) { } default void showScreenPinningRequest(int taskId) { } - default void appTransitionPending(boolean forced) { } - default void appTransitionCancelled() { } - default void appTransitionStarting(long startTime, long duration, boolean forced) { } - default void appTransitionFinished() { } + + /** + * Called to notify System UI that an application transition is pending. + * @see IStatusBar#appTransitionPending(int). + * + * @param displayId The id of the display to notify. + * @param forced {@code true} to force transition pending. + */ + default void appTransitionPending(int displayId, boolean forced) { } + + /** + * Called to notify System UI that an application transition is canceled. + * @see IStatusBar#appTransitionCancelled(int). + * + * @param displayId The id of the display to notify. + */ + default void appTransitionCancelled(int displayId) { } + + /** + * Called to notify System UI that an application transition is starting. + * @see IStatusBar#appTransitionStarting(int, long, long). + * + * @param displayId The id of the display to notify. + * @param startTime Transition start time. + * @param duration Transition duration. + * @param forced {@code true} to force transition pending. + */ + default void appTransitionStarting( + int displayId, long startTime, long duration, boolean forced) { } + + /** + * Called to notify System UI that an application transition is finished. + * @see IStatusBar#appTransitionFinished(int) + * + * @param displayId The id of the display to notify. + */ + default void appTransitionFinished(int displayId) { } default void showAssistDisclosure() { } default void startAssist(Bundle args) { } default void onCameraLaunchGestureDetected(int source) { } @@ -176,18 +279,43 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } @VisibleForTesting - public CommandQueue() { + public CommandQueue(Context context) { + context.getSystemService(DisplayManager.class).registerDisplayListener(this, mHandler); + // We always have default display. + setDisabled(DEFAULT_DISPLAY, DISABLE_NONE, DISABLE2_NONE); } + @Override + public void onDisplayAdded(int displayId) { } + + @Override + public void onDisplayRemoved(int displayId) { + synchronized (mLock) { + mDisplayDisabled.remove(displayId); + } + } + + @Override + public void onDisplayChanged(int displayId) { } + + // TODO(b/118592525): add multi-display support if needed. public boolean panelsEnabled() { - return (mDisable1 & StatusBarManager.DISABLE_EXPAND) == 0 - && (mDisable2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0 + final int disabled1 = getDisabled1(DEFAULT_DISPLAY); + final int disabled2 = getDisabled2(DEFAULT_DISPLAY); + return (disabled1 & StatusBarManager.DISABLE_EXPAND) == 0 + && (disabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0 && !ONLY_CORE_APPS; } public void addCallback(Callbacks callbacks) { mCallbacks.add(callbacks); - callbacks.disable(mDisable1, mDisable2, false /* animate */); + // TODO(b/117478341): find a better way to pass disable flags by display. + for (int i = 0; i < mDisplayDisabled.size(); i++) { + int displayId = mDisplayDisabled.keyAt(i); + int disabled1 = getDisabled1(displayId); + int disabled2 = getDisabled2(displayId); + callbacks.disable(displayId, disabled1, disabled2, false /* animate */); + } } public void removeCallback(Callbacks callbacks) { @@ -209,12 +337,21 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } } - public void disable(int state1, int state2, boolean animate) { + /** + * Called to notify that disable flags are updated. + * @see Callbacks#disable(int, int, int, boolean). + */ + public void disable(int displayId, @DisableFlags int state1, @Disable2Flags int state2, + boolean animate) { synchronized (mLock) { - mDisable1 = state1; - mDisable2 = state2; + setDisabled(displayId, state1, state2); mHandler.removeMessages(MSG_DISABLE); - Message msg = mHandler.obtainMessage(MSG_DISABLE, state1, state2, animate); + final SomeArgs args = SomeArgs.obtain(); + args.argi1 = displayId; + args.argi2 = state1; + args.argi3 = state2; + args.argi4 = animate ? 1 : 0; + Message msg = mHandler.obtainMessage(MSG_DISABLE, args); if (Looper.myLooper() == mHandler.getLooper()) { // If its the right looper execute immediately so hides can be handled quickly. mHandler.handleMessage(msg); @@ -225,14 +362,42 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } } - // TODO(b/117478341): Add multi-display support. @Override - public void disable(int displayId, int state1, int state2) { - disable(state1, state2, true); + public void disable(int displayId, @DisableFlags int state1, @Disable2Flags int state2) { + disable(displayId, state1, state2, true); + } + + /** + * Apply current disable flags by {@link CommandQueue#disable(int, int, int, boolean)}. + * + * @param displayId The id of the display to notify. + * @param animate {@code true} to show animations. + */ + public void recomputeDisableFlags(int displayId, boolean animate) { + int disabled1 = getDisabled1(displayId); + int disabled2 = getDisabled2(displayId); + disable(displayId, disabled1, disabled2, animate); + } + + private void setDisabled(int displayId, int disabled1, int disabled2) { + mDisplayDisabled.put(displayId, new Pair<>(disabled1, disabled2)); } - public void recomputeDisableFlags(boolean animate) { - disable(mDisable1, mDisable2, animate); + private int getDisabled1(int displayId) { + return getDisabled(displayId).first; + } + + private int getDisabled2(int displayId) { + return getDisabled(displayId).second; + } + + private Pair<Integer, Integer> getDisabled(int displayId) { + Pair<Integer, Integer> disablePair = mDisplayDisabled.get(displayId); + if (disablePair == null) { + disablePair = new Pair<>(DISABLE_NONE, DISABLE2_NONE); + mDisplayDisabled.put(displayId, disablePair); + } + return disablePair; } public void animateExpandNotificationsPanel() { @@ -270,7 +435,6 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } } - // TODO(b/117478341): Add multi-display support. @Override public void setSystemUiVisibility(int displayId, int vis, int fullscreenStackVis, int dockedStackVis, int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) { @@ -278,34 +442,38 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< // Don't coalesce these, since it might have one time flags set such as // STATUS_BAR_UNHIDE which might get lost. SomeArgs args = SomeArgs.obtain(); - args.argi1 = vis; - args.argi2 = fullscreenStackVis; - args.argi3 = dockedStackVis; - args.argi4 = mask; + args.argi1 = displayId; + args.argi2 = vis; + args.argi3 = fullscreenStackVis; + args.argi4 = dockedStackVis; + args.argi5 = mask; args.arg1 = fullscreenStackBounds; args.arg2 = dockedStackBounds; mHandler.obtainMessage(MSG_SET_SYSTEMUI_VISIBILITY, args).sendToTarget(); } } - // TODO(b/117478341): Add multi-display support. @Override public void topAppWindowChanged(int displayId, boolean menuVisible) { synchronized (mLock) { mHandler.removeMessages(MSG_TOP_APP_WINDOW_CHANGED); - mHandler.obtainMessage(MSG_TOP_APP_WINDOW_CHANGED, menuVisible ? 1 : 0, 0, - null).sendToTarget(); + mHandler.obtainMessage(MSG_TOP_APP_WINDOW_CHANGED, + displayId, menuVisible ? 1 : 0, null).sendToTarget(); } } - // TODO(b/117478341): Add multi-display support. @Override public void setImeWindowStatus(int displayId, IBinder token, int vis, int backDisposition, boolean showImeSwitcher) { synchronized (mLock) { mHandler.removeMessages(MSG_SHOW_IME_BUTTON); - Message m = mHandler.obtainMessage(MSG_SHOW_IME_BUTTON, vis, backDisposition, token); - m.getData().putBoolean(SHOW_IME_SWITCHER_KEY, showImeSwitcher); + SomeArgs args = SomeArgs.obtain(); + args.argi1 = displayId; + args.argi2 = vis; + args.argi3 = backDisposition; + args.argi4 = showImeSwitcher ? 1 : 0; + args.arg1 = token; + Message m = mHandler.obtainMessage(MSG_SHOW_IME_BUTTON, args); m.sendToTarget(); } } @@ -381,12 +549,11 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } } - // TODO(b/117478341): Add multi-display support. @Override public void setWindowState(int displayId, int window, int state) { synchronized (mLock) { // don't coalesce these - mHandler.obtainMessage(MSG_SET_WINDOW_STATE, window, state, null).sendToTarget(); + mHandler.obtainMessage(MSG_SET_WINDOW_STATE, displayId, window, state).sendToTarget(); } } @@ -397,44 +564,54 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } } - // TODO(b/117478341): Add multi-display support. @Override public void appTransitionPending(int displayId) { - appTransitionPending(false /* forced */); + appTransitionPending(displayId, false /* forced */); } - public void appTransitionPending(boolean forced) { + /** + * Called to notify System UI that an application transition is pending. + * @see Callbacks#appTransitionPending(int, boolean) + */ + public void appTransitionPending(int displayId, boolean forced) { synchronized (mLock) { - mHandler.obtainMessage(MSG_APP_TRANSITION_PENDING, forced ? 1 : 0, 0).sendToTarget(); + mHandler.obtainMessage(MSG_APP_TRANSITION_PENDING, displayId, forced ? 1 : 0) + .sendToTarget(); } } - // TODO(b/117478341): Add multi-display support. @Override public void appTransitionCancelled(int displayId) { synchronized (mLock) { - mHandler.sendEmptyMessage(MSG_APP_TRANSITION_CANCELLED); + mHandler.obtainMessage(MSG_APP_TRANSITION_CANCELLED, displayId).sendToTarget(); } } - // TODO(b/117478341): Add multi-display support. @Override public void appTransitionStarting(int displayId, long startTime, long duration) { - appTransitionStarting(startTime, duration, false /* forced */); + appTransitionStarting(displayId, startTime, duration, false /* forced */); } - public void appTransitionStarting(long startTime, long duration, boolean forced) { + /** + * Called to notify System UI that an application transition is starting. + * @see Callbacks#appTransitionStarting(int, long, long, boolean). + */ + public void appTransitionStarting(int displayId, long startTime, long duration, + boolean forced) { synchronized (mLock) { - mHandler.obtainMessage(MSG_APP_TRANSITION_STARTING, forced ? 1 : 0, 0, - Pair.create(startTime, duration)).sendToTarget(); + final SomeArgs args = SomeArgs.obtain(); + args.argi1 = displayId; + args.argi2 = forced ? 1 : 0; + args.arg1 = startTime; + args.arg2 = duration; + mHandler.obtainMessage(MSG_APP_TRANSITION_STARTING, args).sendToTarget(); } } - // TODO(b/117478341): Add multi-display support. @Override public void appTransitionFinished(int displayId) { synchronized (mLock) { - mHandler.sendEmptyMessage(MSG_APP_TRANSITION_FINISHED); + mHandler.obtainMessage(MSG_APP_TRANSITION_FINISHED, displayId).sendToTarget(); } } @@ -619,8 +796,10 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< break; } case MSG_DISABLE: + SomeArgs args = (SomeArgs) msg.obj; for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).disable(msg.arg1, msg.arg2, (Boolean) msg.obj); + mCallbacks.get(i).disable(args.argi1, args.argi2, args.argi3, + args.argi4 != 0 /* animate */); } break; case MSG_EXPAND_NOTIFICATIONS: @@ -644,22 +823,23 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } break; case MSG_SET_SYSTEMUI_VISIBILITY: - SomeArgs args = (SomeArgs) msg.obj; + args = (SomeArgs) msg.obj; for (int i = 0; i < mCallbacks.size(); i++) { mCallbacks.get(i).setSystemUiVisibility(args.argi1, args.argi2, args.argi3, - args.argi4, (Rect) args.arg1, (Rect) args.arg2); + args.argi4, args.argi5, (Rect) args.arg1, (Rect) args.arg2); } args.recycle(); break; case MSG_TOP_APP_WINDOW_CHANGED: for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).topAppWindowChanged(msg.arg1 != 0); + mCallbacks.get(i).topAppWindowChanged(msg.arg1, msg.arg2 != 0); } break; case MSG_SHOW_IME_BUTTON: + args = (SomeArgs) msg.obj; for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).setImeWindowStatus((IBinder) msg.obj, msg.arg1, msg.arg2, - msg.getData().getBoolean(SHOW_IME_SWITCHER_KEY, false)); + mCallbacks.get(i).setImeWindowStatus(args.argi1, (IBinder) args.arg1, + args.argi2, args.argi3, args.argi4 != 0 /* showImeSwitcher */); } break; case MSG_SHOW_RECENT_APPS: @@ -699,7 +879,7 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< break; case MSG_SET_WINDOW_STATE: for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).setWindowState(msg.arg1, msg.arg2); + mCallbacks.get(i).setWindowState(msg.arg1, msg.arg2, (int) msg.obj); } break; case MSG_SHOW_SCREEN_PIN_REQUEST: @@ -709,24 +889,24 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< break; case MSG_APP_TRANSITION_PENDING: for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).appTransitionPending(msg.arg1 != 0); + mCallbacks.get(i).appTransitionPending(msg.arg1, msg.arg2 != 0); } break; case MSG_APP_TRANSITION_CANCELLED: for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).appTransitionCancelled(); + mCallbacks.get(i).appTransitionCancelled(msg.arg1); } break; case MSG_APP_TRANSITION_STARTING: + args = (SomeArgs) msg.obj; for (int i = 0; i < mCallbacks.size(); i++) { - Pair<Long, Long> data = (Pair<Long, Long>) msg.obj; - mCallbacks.get(i).appTransitionStarting(data.first, data.second, - msg.arg1 != 0); + mCallbacks.get(i).appTransitionStarting(args.argi1, (long) args.arg1, + (long) args.arg2, args.argi2 != 0 /* forced */); } break; case MSG_APP_TRANSITION_FINISHED: for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).appTransitionFinished(); + mCallbacks.get(i).appTransitionFinished(msg.arg1); } break; case MSG_ASSIST_DISCLOSURE: @@ -858,7 +1038,7 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< public static class CommandQueueStart extends SystemUI { @Override public void start() { - putComponent(CommandQueue.class, new CommandQueue()); + putComponent(CommandQueue.class, new CommandQueue(mContext)); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java index 43eaff40ffe0..9740d1dd6d1c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java @@ -34,6 +34,7 @@ import android.view.WindowManagerGlobal; import com.android.systemui.Dependency; import com.android.systemui.plugins.DarkIconDispatcher; +import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.BarTransitions.TransitionMode; import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.NavigationBarFragment; @@ -132,12 +133,21 @@ public class NavigationBarController implements DisplayListener { // Unfortunately, we still need it because status bar needs LightBarController // before notifications creation. We cannot directly use getLightBarController() // from NavigationBarFragment directly. - LightBarController controller = isOnDefaultDisplay + LightBarController lightBarController = isOnDefaultDisplay ? Dependency.get(LightBarController.class) : new LightBarController(context, Dependency.get(DarkIconDispatcher.class), Dependency.get(BatteryController.class)); - navBar.setLightBarController(controller); + navBar.setLightBarController(lightBarController); + + // TODO(b/118592525): to support multi-display, we start to add something which is + // per-display, while others may be global. I think it's time to add + // a new class maybe named DisplayDependency to solve per-display + // Dependency problem. + AutoHideController autoHideController = isOnDefaultDisplay + ? Dependency.get(AutoHideController.class) + : new AutoHideController(context, mHandler); + navBar.setAutoHideController(autoHideController); navBar.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE); mNavigationBars.append(displayId, navBar); }); @@ -197,15 +207,6 @@ public class NavigationBarController implements DisplayListener { } } - /** @see NavigationBarFragment#isSemiTransparent() */ - public boolean isSemiTransparent(int displayId) { - NavigationBarFragment navBar = mNavigationBars.get(displayId); - if (navBar != null) { - return navBar.isSemiTransparent(); - } - return false; - } - /** @see NavigationBarFragment#disableAnimationsDuringHide(long) */ public void disableAnimationsDuringHide(int displayId, long delay) { NavigationBarFragment navBar = mNavigationBars.get(displayId); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java index 1bf101c00711..e59bc2a82c4c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java @@ -37,7 +37,6 @@ import android.media.session.PlaybackState; import android.os.Handler; import android.os.Trace; import android.os.UserHandle; -import android.service.notification.StatusBarNotification; import android.util.Log; import android.view.View; import android.widget.ImageView; @@ -157,15 +156,10 @@ public class NotificationMediaManager implements Dumpable { notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() { @Override public void onEntryRemoved( - @Nullable Entry entry, - String key, - StatusBarNotification old, + Entry entry, NotificationVisibility visibility, - boolean lifetimeExtended, boolean removedByUser) { - if (!lifetimeExtended) { - onNotificationRemoved(key); - } + onNotificationRemoved(entry.key); } }); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java index 886d99eeff17..1ab9c5c2b4a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java @@ -254,13 +254,10 @@ public class NotificationRemoteInputManager implements Dumpable { @Override public void onEntryRemoved( @Nullable NotificationData.Entry entry, - String key, - StatusBarNotification old, NotificationVisibility visibility, - boolean lifetimeExtended, boolean removedByUser) { if (removedByUser && entry != null) { - onPerformRemoveNotification(entry, key); + onPerformRemoveNotification(entry, entry.key); } } }); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java index 7b42dd901d72..2bb0d5ce9161 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java @@ -20,7 +20,6 @@ import static com.android.systemui.statusbar.NotificationRemoteInputManager.FORC import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT; import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP; -import android.annotation.Nullable; import android.app.Notification; import android.service.notification.StatusBarNotification; import android.util.Log; @@ -83,13 +82,10 @@ public class NotificationAlertingManager { @Override public void onEntryRemoved( - @Nullable NotificationData.Entry entry, - String key, - StatusBarNotification old, + NotificationData.Entry entry, NotificationVisibility visibility, - boolean lifetimeExtended, boolean removedByUser) { - stopAlerting(key); + stopAlerting(entry.key); } }); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java index 1d06ce031f2b..2f60f115ed53 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java @@ -71,20 +71,14 @@ public interface NotificationEntryListener { * because the developer retracted it). * @param entry notification data entry that was removed. Null if no entry existed for the * removed key at the time of removal. - * @param key key of notification that was removed - * @param old StatusBarNotification of the notification before it was removed * @param visibility logging data related to the visibility of the notification at the time of * removal, if it was removed by a user action. Null if it was not removed by * a user action. - * @param lifetimeExtended true if something is artificially extending how long the notification * @param removedByUser true if the notification was removed by a user action */ default void onEntryRemoved( - @Nullable NotificationData.Entry entry, - String key, - StatusBarNotification old, + NotificationData.Entry entry, @Nullable NotificationVisibility visibility, - boolean lifetimeExtended, boolean removedByUser) { } } 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 e0fa723730c7..6b5e70825d1d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java @@ -15,13 +15,10 @@ */ package com.android.systemui.statusbar.notification; -import static com.android.systemui.bubbles.BubbleController.DEBUG_DEMOTE_TO_NOTIF; - import android.annotation.Nullable; import android.app.Notification; import android.content.Context; import android.os.Handler; -import android.os.PowerManager; import android.os.UserHandle; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; @@ -34,14 +31,12 @@ import com.android.internal.statusbar.NotificationVisibility; import com.android.systemui.Dependency; import com.android.systemui.Dumpable; import com.android.systemui.ForegroundServiceController; -import com.android.systemui.bubbles.BubbleController; import com.android.systemui.statusbar.NotificationLifetimeExtender; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationUiAdjustment; import com.android.systemui.statusbar.NotificationUpdateHandler; import com.android.systemui.statusbar.notification.NotificationData.KeyguardEnvironment; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.notification.row.NotificationInflater; import com.android.systemui.statusbar.notification.row.NotificationInflater.InflationFlag; @@ -66,8 +61,7 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater.InflationCallback, NotificationUpdateHandler, - VisualStabilityManager.Callback, - BubbleController.BubbleDismissListener { + VisualStabilityManager.Callback { private static final String TAG = "NotificationEntryMgr"; protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -82,7 +76,6 @@ public class NotificationEntryManager implements Dependency.get(DeviceProvisionedController.class); private final ForegroundServiceController mForegroundServiceController = Dependency.get(ForegroundServiceController.class); - private final BubbleController mBubbleController = Dependency.get(BubbleController.class); // Lazily retrieved dependencies private NotificationRemoteInputManager mRemoteInputManager; @@ -92,9 +85,7 @@ public class NotificationEntryManager implements private Runnable mUpdateNotificationViewsCallback; private NotificationPresenter mPresenter; - protected PowerManager mPowerManager; private NotificationListenerService.RankingMap mLatestRankingMap; - protected HeadsUpManager mHeadsUpManager; protected NotificationData mNotificationData; protected NotificationListContainer mListContainer; @VisibleForTesting @@ -130,8 +121,6 @@ public class NotificationEntryManager implements public NotificationEntryManager(Context context) { mContext = context; - mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); - mBubbleController.setDismissListener(this /* bubbleEventListener */); mNotificationData = new NotificationData(); mDeferredNotificationViewUpdateHandler = new Handler(); } @@ -158,13 +147,18 @@ public class NotificationEntryManager implements return mNotificationRowBinder; } + // TODO: Remove this once we can always use a mocked row binder in our tests + @VisibleForTesting + void setRowBinder(NotificationRowBinder notificationRowBinder) { + mNotificationRowBinder = notificationRowBinder; + } + public void setUpWithPresenter(NotificationPresenter presenter, NotificationListContainer listContainer, HeadsUpManager headsUpManager) { mPresenter = presenter; mUpdateNotificationViewsCallback = mPresenter::updateNotificationViews; - mHeadsUpManager = headsUpManager; - mNotificationData.setHeadsUpManager(mHeadsUpManager); + mNotificationData.setHeadsUpManager(headsUpManager); mListContainer = listContainer; mDeviceProvisionedController.addCallback(mDeviceProvisionedListener); @@ -195,10 +189,6 @@ public class NotificationEntryManager implements return mPresenter; } - public ExpandableNotificationRow.LongPressListener getNotificationLongClicker() { - return getRowBinder().getNotificationLongClicker(); - } - @Override public void onReorderingAllowed() { updateNotifications(); @@ -213,23 +203,6 @@ public class NotificationEntryManager implements n.getKey(), null, nv, false /* forceRemove */, true /* removedByUser */); } - @Override - public void onStackDismissed() { - updateNotifications(); - } - - @Override - public void onBubbleDismissed(String key) { - NotificationData.Entry entry = mNotificationData.get(key); - if (entry != null) { - entry.setBubbleDismissed(true); - if (!DEBUG_DEMOTE_TO_NOTIF) { - performRemoveNotification(entry.notification); - } - } - updateNotifications(); - } - private void abortExistingInflation(String key) { if (mPendingNotifications.containsKey(key)) { NotificationData.Entry entry = mPendingNotifications.get(key); @@ -257,21 +230,6 @@ public class NotificationEntryManager implements } } - private void addEntry(NotificationData.Entry shadeEntry) { - if (shadeEntry == null) { - return; - } - // Add the expanded view and icon. - mNotificationData.add(shadeEntry); - tagForeground(shadeEntry.notification); - updateNotifications(); - for (NotificationEntryListener listener : mNotificationEntryListeners) { - listener.onNotificationAdded(shadeEntry); - } - - maybeScheduleUpdateNotificationViews(shadeEntry); - } - private void maybeScheduleUpdateNotificationViews(NotificationData.Entry entry) { long audibleAlertTimeout = RECENTLY_ALERTED_THRESHOLD_MS - (System.currentTimeMillis() - entry.lastAudiblyAlertedMs); @@ -293,7 +251,13 @@ public class NotificationEntryManager implements for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onEntryInflated(entry, inflatedFlags); } - addEntry(entry); + mNotificationData.add(entry); + tagForeground(entry.notification); + updateNotifications(); + for (NotificationEntryListener listener : mNotificationEntryListeners) { + listener.onNotificationAdded(entry); + } + maybeScheduleUpdateNotificationViews(entry); } else { for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onEntryReinflated(entry); @@ -319,7 +283,6 @@ public class NotificationEntryManager implements abortExistingInflation(key); - StatusBarNotification old = null; boolean lifetimeExtended = false; if (entry != null) { @@ -344,8 +307,6 @@ public class NotificationEntryManager implements extender.setShouldManageLifetime(entry, false /* shouldManage */); } - mForegroundServiceController.removeNotification(entry.notification); - if (entry.rowExists()) { entry.removeRow(); mListContainer.cleanUpViewStateForEntry(entry); @@ -354,25 +315,15 @@ public class NotificationEntryManager implements // Let's remove the children if this was a summary handleGroupSummaryRemoved(key); - old = removeNotificationViews(key, ranking); - } - } - - for (NotificationEntryListener listener : mNotificationEntryListeners) { - listener.onEntryRemoved(entry, key, old, visibility, lifetimeExtended, removedByUser); - } - } + mNotificationData.remove(key, ranking); + updateNotifications(); + Dependency.get(LeakDetector.class).trackGarbage(entry); - private StatusBarNotification removeNotificationViews(String key, - NotificationListenerService.RankingMap ranking) { - NotificationData.Entry entry = mNotificationData.remove(key, ranking); - if (entry == null) { - Log.w(TAG, "removeNotification for unknown key: " + key); - return null; + for (NotificationEntryListener listener : mNotificationEntryListeners) { + listener.onEntryRemoved(entry, visibility, removedByUser); + } + } } - updateNotifications(); - Dependency.get(LeakDetector.class).trackGarbage(entry); - return entry.notification; } /** @@ -430,26 +381,6 @@ public class NotificationEntryManager implements } } - private NotificationData.Entry createNotificationEntry( - StatusBarNotification sbn, NotificationListenerService.Ranking ranking) - throws InflationException { - if (DEBUG) { - Log.d(TAG, "createNotificationEntry(notification=" + sbn + " " + ranking); - } - - NotificationData.Entry entry = new NotificationData.Entry(sbn, ranking); - if (BubbleController.shouldAutoBubble(getContext(), entry)) { - entry.setIsBubble(true); - } - - Dependency.get(LeakDetector.class).trackInstance(entry); - entry.createIcons(mContext, sbn); - // Construct the expanded view. - getRowBinder().inflateViews(entry, () -> performRemoveNotification(sbn), - mNotificationData.get(entry.key) != null); - return entry; - } - private void addNotificationInternal(StatusBarNotification notification, NotificationListenerService.RankingMap rankingMap) throws InflationException { String key = notification.getKey(); @@ -460,11 +391,15 @@ public class NotificationEntryManager implements mNotificationData.updateRanking(rankingMap); NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking(); rankingMap.getRanking(key, ranking); - NotificationData.Entry entry = createNotificationEntry(notification, ranking); - abortExistingInflation(key); - mForegroundServiceController.addNotification(notification, - mNotificationData.getImportance(key)); + NotificationData.Entry entry = new NotificationData.Entry(notification, ranking); + + Dependency.get(LeakDetector.class).trackInstance(entry); + // Construct the expanded view. + getRowBinder().inflateViews(entry, () -> performRemoveNotification(notification), + mNotificationData.get(entry.key) != null); + + abortExistingInflation(key); mPendingNotifications.put(key, entry); for (NotificationEntryListener listener : mNotificationEntryListeners) { @@ -523,21 +458,11 @@ public class NotificationEntryManager implements mNotificationData.update(entry, ranking, notification); - entry.updateIcons(mContext, notification); getRowBinder().inflateViews(entry, () -> performRemoveNotification(notification), mNotificationData.get(entry.key) != null); - mForegroundServiceController.updateNotification(notification, - mNotificationData.getImportance(key)); - updateNotifications(); - if (!notification.isClearable()) { - // The user may have performed a dismiss action on the notification, since it's - // not clearable we should snap it back. - mListContainer.snapViewIfNeeded(entry); - } - if (DEBUG) { // Is this for you? boolean isForCurrentUser = Dependency.get(KeyguardEnvironment.class) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java index 5e99c388655f..700382a103b2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java @@ -117,8 +117,8 @@ public class NotificationFilter { return true; } - if (getFsc().isDungeonNotification(sbn) - && !getFsc().isDungeonNeededForUser(sbn.getUserId())) { + if (getFsc().isDisclosureNotification(sbn) + && !getFsc().isDisclosureNeededForUser(sbn.getUserId())) { // this is a foreground-service disclosure for a user that does not need to show one return true; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationRowBinder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationRowBinder.java index b241b8a70b3f..058efca51b21 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationRowBinder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationRowBinder.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.notification; import static com.android.internal.util.Preconditions.checkNotNull; +import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; import static com.android.systemui.statusbar.NotificationRemoteInputManager.ENABLE_REMOTE_INPUT; import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT; import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP; @@ -51,6 +52,7 @@ import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.policy.HeadsUpManager; import javax.inject.Inject; +import javax.inject.Named; import javax.inject.Singleton; /** Handles inflating and updating views for notifications. */ @@ -72,6 +74,7 @@ public class NotificationRowBinder { private final NotificationMessagingUtil mMessagingUtil; private final ExpandableNotificationRow.ExpansionLogger mExpansionLogger = this::logNotificationExpansion; + private final boolean mAllowLongPress; private NotificationRemoteInputManager mRemoteInputManager; private NotificationPresenter mPresenter; @@ -83,9 +86,11 @@ public class NotificationRowBinder { private NotificationClicker mNotificationClicker; @Inject - public NotificationRowBinder(Context context) { + public NotificationRowBinder(Context context, + @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean allowLongPress) { mContext = context; mMessagingUtil = new NotificationMessagingUtil(context); + mAllowLongPress = allowLongPress; mBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); } @@ -120,17 +125,22 @@ public class NotificationRowBinder { /** * Inflates the views for the given entry (possibly asynchronously). */ - public void inflateViews(NotificationData.Entry entry, Runnable onDismissRunnable, - boolean isUpdate) { + public void inflateViews( + NotificationData.Entry entry, + Runnable onDismissRunnable, + boolean isUpdate) + throws InflationException { ViewGroup parent = mListContainer.getViewParentForNotification(entry); PackageManager pmUser = StatusBar.getPackageManagerForUser(mContext, entry.notification.getUser().getIdentifier()); final StatusBarNotification sbn = entry.notification; if (entry.rowExists()) { + entry.updateIcons(mContext, sbn); entry.reset(); updateNotification(entry, pmUser, sbn, entry.getRow(), isUpdate); } else { + entry.createIcons(mContext, sbn); new RowInflaterTask().inflate(mContext, parent, entry, row -> { bindRow(entry, pmUser, sbn, row, onDismissRunnable); @@ -147,7 +157,9 @@ public class NotificationRowBinder { row.setHeadsUpManager(mHeadsUpManager); row.setOnExpandClickListener(mPresenter); row.setInflationCallback(mInflationCallback); - row.setLongPressListener(getNotificationLongClicker()); + if (mAllowLongPress) { + row.setLongPressListener(mGutsManager::openGuts); + } mListContainer.bindRow(row); getRemoteInputManager().bindRow(row); @@ -260,10 +272,6 @@ public class NotificationRowBinder { row.inflateViews(); } - ExpandableNotificationRow.LongPressListener getNotificationLongClicker() { - return mGutsManager::openGuts; - } - private void logNotificationExpansion(String key, boolean userAction, boolean expanded) { mUiOffloadThread.submit(() -> { try { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java index 32acb8df173c..43048a2c087e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java @@ -15,7 +15,6 @@ */ package com.android.systemui.statusbar.notification.logging; -import android.annotation.Nullable; import android.content.Context; import android.os.Handler; import android.os.RemoteException; @@ -168,14 +167,11 @@ public class NotificationLogger implements StateListener { entryManager.addNotificationEntryListener(new NotificationEntryListener() { @Override public void onEntryRemoved( - @Nullable NotificationData.Entry entry, - String key, - StatusBarNotification old, + NotificationData.Entry entry, NotificationVisibility visibility, - boolean lifetimeExtended, boolean removedByUser) { - if (removedByUser && visibility != null && entry.notification != null) { - logNotificationClear(key, entry.notification, visibility); + if (removedByUser && visibility != null) { + logNotificationClear(entry.key, entry.notification, visibility); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java index f0a26536d7b8..1d5b9cce099d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java @@ -16,8 +16,7 @@ package com.android.systemui.statusbar.notification.stack; -import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator - .ExpandAnimationParameters; +import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters; import android.view.View; import android.view.ViewGroup; @@ -113,13 +112,6 @@ public interface NotificationListContainer extends ExpandableView.OnHeightChange void setMaxDisplayedNotifications(int maxNotifications); /** - * Handle snapping a non-dismissable row back if the user tried to dismiss it. - * - * @param entry the entry whose row needs to snap back - */ - void snapViewIfNeeded(NotificationData.Entry entry); - - /** * Get the view parent for a notification entry. For example, NotificationStackScrollLayout. * * @param entry entry to get the view parent for diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index f982ecf6f103..1248cbff5e1a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -16,9 +16,11 @@ package com.android.systemui.statusbar.notification.stack; +import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters; import static com.android.systemui.statusbar.notification.stack.StackStateAnimator.ANIMATION_DURATION_SWIPE; import static com.android.systemui.statusbar.phone.NotificationIconAreaController.LOW_PRIORITY; +import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -95,6 +97,7 @@ import com.android.systemui.statusbar.StatusBarStateController; import com.android.systemui.statusbar.StatusBarStateController.StateListener; import com.android.systemui.statusbar.notification.FakeShadowView; import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.NotificationEntryListener; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.notification.ShadeViewRefactor; @@ -136,6 +139,9 @@ import java.util.HashSet; import java.util.List; import java.util.function.BiConsumer; +import javax.inject.Inject; +import javax.inject.Named; + /** * A layout which handles a dynamic amount of notifications and presents them in a scrollable stack. */ @@ -165,6 +171,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd private final Paint mBackgroundPaint = new Paint(); private final boolean mShouldDrawNotificationBackground; private boolean mLowPriorityBeforeSpeedBump; + private final boolean mAllowLongPress; private float mExpandedHeight; private int mOwnScrollY; @@ -452,27 +459,16 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd private final NotificationGutsManager mNotificationGutsManager = Dependency.get(NotificationGutsManager.class); - @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) - public NotificationStackScrollLayout(Context context) { - this(context, null); - } - - @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) - public NotificationStackScrollLayout(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) - public NotificationStackScrollLayout(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) - public NotificationStackScrollLayout(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); + @Inject + public NotificationStackScrollLayout( + @Named(VIEW_CONTEXT) Context context, + AttributeSet attrs, + @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean allowLongPress) { + super(context, attrs, 0, 0); Resources res = getResources(); + mAllowLongPress = allowLongPress; + for (int i = 0; i < NUM_SECTIONS; i++) { mSections[i] = new NotificationSection(this); } @@ -522,6 +518,17 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd mLowPriorityBeforeSpeedBump = "1".equals(newValue); } }, LOW_PRIORITY); + + mEntryManager.addNotificationEntryListener(new NotificationEntryListener() { + @Override + public void onEntryUpdated(NotificationData.Entry entry) { + if (!entry.notification.isClearable()) { + // The user may have performed a dismiss action on the notification, since it's + // not clearable we should snap it back. + snapViewIfNeeded(entry); + } + } + }); } @Override @@ -532,7 +539,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd inflateEmptyShadeView(); inflateFooterView(); mVisualStabilityManager.setVisibilityLocationProvider(this::isInVisibleLocation); - setLongPressListener(mEntryManager.getNotificationLongClicker()); + if (mAllowLongPress) { + setLongPressListener(mGutsManager::openGuts); + } } @Override @@ -1541,9 +1550,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd true /* isDismissAll */); } - @Override @ShadeViewRefactor(RefactorComponent.STATE_RESOLVER) - public void snapViewIfNeeded(NotificationData.Entry entry) { + private void snapViewIfNeeded(NotificationData.Entry entry) { ExpandableNotificationRow child = entry.getRow(); boolean animate = mIsExpanded || isPinnedHeadsUp(child); // If the child is showing the notification menu snap to that diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java index f1d9549b9284..975aee51228b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java @@ -189,10 +189,13 @@ class NotificationSwipeHelper extends SwipeHelper boolean isFastNonDismissGesture = gestureFastEnough && !gestureTowardsMenu && !isDismissGesture; boolean isMenuRevealingGestureAwayFromMenu = slowSwipedFarEnough || isFastNonDismissGesture; - if (isNonDismissGestureTowardsMenu - || (!isFalseGesture(ev) && isMenuRevealingGestureAwayFromMenu)) { + int menuSnapTarget = menuRow.getMenuSnapTarget(); + boolean isNonFalseMenuRevealingGesture = + !isFalseGesture(ev) && isMenuRevealingGestureAwayFromMenu; + if ((isNonDismissGestureTowardsMenu || isNonFalseMenuRevealingGesture) + && menuSnapTarget != 0) { // Menu has not been snapped to previously and this is menu revealing gesture - snapOpen(animView, menuRow.getMenuSnapTarget(), velocity); + snapOpen(animView, menuSnapTarget, velocity); menuRow.onSnapOpen(); } else if (isDismissGesture(ev) && !gestureTowardsMenu) { dismiss(animView, velocity); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoHideController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoHideController.java new file mode 100644 index 000000000000..b9425d4745d2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoHideController.java @@ -0,0 +1,216 @@ +/* + * 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.systemui.statusbar.phone; + +import static com.android.systemui.Dependency.MAIN_HANDLER_NAME; +import static com.android.systemui.statusbar.phone.BarTransitions.MODE_SEMI_TRANSPARENT; + +import android.content.Context; +import android.graphics.Rect; +import android.os.Handler; +import android.os.RemoteException; +import android.util.Log; +import android.view.IWindowManager; +import android.view.MotionEvent; +import android.view.View; + +import com.android.systemui.Dependency; +import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.NotificationRemoteInputManager; + +import javax.inject.Inject; +import javax.inject.Named; + +/** A controller to control all auto-hide things. */ +public class AutoHideController implements CommandQueue.Callbacks { + private static final String TAG = "AutoHideController"; + + private final IWindowManager mWindowManagerService; + + private final Handler mHandler; + private final NotificationRemoteInputManager mRemoteInputManager; + private final CommandQueue mCommandQueue; + private StatusBar mStatusBar; + private NavigationBarFragment mNavigationBar; + + private int mDisplayId; + private int mSystemUiVisibility; + // last value sent to window manager + private int mLastDispatchedSystemUiVisibility = ~View.SYSTEM_UI_FLAG_VISIBLE; + + private boolean mAutoHideSuspended; + + private static final long AUTOHIDE_TIMEOUT_MS = 2250; + + private final Runnable mAutoHide = () -> { + int requested = mSystemUiVisibility & ~getTransientMask(); + if (mSystemUiVisibility != requested) { + notifySystemUiVisibilityChanged(requested); + } + }; + + @Inject + public AutoHideController(Context context, @Named(MAIN_HANDLER_NAME) Handler handler) { + mCommandQueue = SysUiServiceProvider.getComponent(context, CommandQueue.class); + mCommandQueue.addCallback(this); + mHandler = handler; + mRemoteInputManager = Dependency.get(NotificationRemoteInputManager.class); + mWindowManagerService = Dependency.get(IWindowManager.class); + + mDisplayId = context.getDisplayId(); + } + + void setStatusBar(StatusBar statusBar) { + mStatusBar = statusBar; + } + + void setNavigationBar(NavigationBarFragment navigationBar) { + mNavigationBar = navigationBar; + } + + @Override + public void setSystemUiVisibility(int displayId, int vis, int fullscreenStackVis, + int dockedStackVis, int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) { + if (displayId != mDisplayId) { + return; + } + int oldVal = mSystemUiVisibility; + int newVal = (oldVal & ~mask) | (vis & mask); + int diff = newVal ^ oldVal; + + if (diff != 0) { + mSystemUiVisibility = newVal; + + // ready to unhide + if (hasStatusBar() && (vis & View.STATUS_BAR_UNHIDE) != 0) { + mSystemUiVisibility &= ~View.STATUS_BAR_UNHIDE; + } + + if (hasNavigationBar() && (vis & View.NAVIGATION_BAR_UNHIDE) != 0) { + mSystemUiVisibility &= ~View.NAVIGATION_BAR_UNHIDE; + } + + // Re-send setSystemUiVisibility to update un-hide status. + if (mSystemUiVisibility != newVal) { + mCommandQueue.setSystemUiVisibility(mDisplayId, mSystemUiVisibility, + fullscreenStackVis, dockedStackVis, mask, fullscreenStackBounds, + dockedStackBounds); + } + + notifySystemUiVisibilityChanged(mSystemUiVisibility); + } + } + + private void notifySystemUiVisibilityChanged(int vis) { + try { + if (mLastDispatchedSystemUiVisibility != vis) { + mWindowManagerService.statusBarVisibilityChanged(mDisplayId, vis); + mLastDispatchedSystemUiVisibility = vis; + } + } catch (RemoteException ex) { + Log.w(TAG, "Cannot get WindowManager"); + } + } + + void resumeSuspendedAutoHide() { + if (mAutoHideSuspended) { + scheduleAutoHide(); + Runnable checkBarModesRunnable = getCheckBarModesRunnable(); + if (checkBarModesRunnable != null) { + mHandler.postDelayed(checkBarModesRunnable, 500); // longer than home -> launcher + } + } + } + + void suspendAutoHide() { + mHandler.removeCallbacks(mAutoHide); + Runnable checkBarModesRunnable = getCheckBarModesRunnable(); + if (checkBarModesRunnable != null) { + mHandler.removeCallbacks(checkBarModesRunnable); + } + mAutoHideSuspended = (mSystemUiVisibility & getTransientMask()) != 0; + } + + void touchAutoHide() { + // update transient bar auto hide + if ((hasStatusBar() && mStatusBar.getStatusBarMode() == MODE_SEMI_TRANSPARENT) + || hasNavigationBar() && mNavigationBar.isSemiTransparent()) { + scheduleAutoHide(); + } else { + cancelAutoHide(); + } + } + + private Runnable getCheckBarModesRunnable() { + if (hasStatusBar()) { + return () -> mStatusBar.checkBarModes(); + } else if (hasNavigationBar()) { + return () -> mNavigationBar.checkNavBarModes(); + } else { + return null; + } + } + + private void cancelAutoHide() { + mAutoHideSuspended = false; + mHandler.removeCallbacks(mAutoHide); + } + + private void scheduleAutoHide() { + cancelAutoHide(); + mHandler.postDelayed(mAutoHide, AUTOHIDE_TIMEOUT_MS); + } + + void checkUserAutoHide(MotionEvent event) { + boolean shouldAutoHide = + (mSystemUiVisibility & getTransientMask()) != 0 // a transient bar is revealed. + && event.getAction() == MotionEvent.ACTION_OUTSIDE // touch outside the source bar. + && event.getX() == 0 && event.getY() == 0; + if (hasStatusBar()) { + // a touch outside both bars + shouldAutoHide &= !mRemoteInputManager.getController().isRemoteInputActive(); + } + if (shouldAutoHide) { + userAutoHide(); + } + } + + private void userAutoHide() { + cancelAutoHide(); + mHandler.postDelayed(mAutoHide, 350); // longer than app gesture -> flag clear + } + + private int getTransientMask() { + int mask = 0; + if (hasStatusBar()) { + mask |= View.STATUS_BAR_TRANSIENT; + } + if (hasNavigationBar()) { + mask |= View.NAVIGATION_BAR_TRANSIENT; + } + return mask; + } + + private boolean hasNavigationBar() { + return mNavigationBar != null; + } + + private boolean hasStatusBar() { + return mStatusBar != null; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java index 1d7e899afc10..fac4dbbe735a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java @@ -30,6 +30,9 @@ import com.android.systemui.statusbar.policy.DataSaverController.Listener; import com.android.systemui.statusbar.policy.HotspotController; import com.android.systemui.statusbar.policy.HotspotController.Callback; +import javax.inject.Inject; +import javax.inject.Named; + /** * Manages which tiles should be automatically added to QS. */ @@ -44,24 +47,31 @@ public class AutoTileManager { private final QSTileHost mHost; private final Handler mHandler; private final AutoAddTracker mAutoTracker; - - public AutoTileManager(Context context, QSTileHost host) { - this(context, new AutoAddTracker(context), host, - new Handler(Dependency.get(Dependency.BG_LOOPER))); - } - - @VisibleForTesting - AutoTileManager(Context context, AutoAddTracker autoAddTracker, QSTileHost host, - Handler handler) { + private final HotspotController mHotspotController; + private final DataSaverController mDataSaverController; + private final ManagedProfileController mManagedProfileController; + private final ColorDisplayController mColorDisplayController; + + @Inject + public AutoTileManager(Context context, AutoAddTracker autoAddTracker, QSTileHost host, + @Named(Dependency.BG_HANDLER_NAME) Handler handler, + HotspotController hotspotController, + DataSaverController dataSaverController, + ManagedProfileController managedProfileController, + ColorDisplayController colorDisplayController) { mAutoTracker = autoAddTracker; mContext = context; mHost = host; mHandler = handler; + mHotspotController = hotspotController; + mDataSaverController = dataSaverController; + mManagedProfileController = managedProfileController; + mColorDisplayController = colorDisplayController; if (!mAutoTracker.isAdded(HOTSPOT)) { - Dependency.get(HotspotController.class).addCallback(mHotspotCallback); + hotspotController.addCallback(mHotspotCallback); } if (!mAutoTracker.isAdded(SAVER)) { - Dependency.get(DataSaverController.class).addCallback(mDataSaverListener); + dataSaverController.addCallback(mDataSaverListener); } if (!mAutoTracker.isAdded(INVERSION)) { mColorsSetting = new SecureSetting(mContext, mHandler, @@ -79,11 +89,11 @@ public class AutoTileManager { mColorsSetting.setListening(true); } if (!mAutoTracker.isAdded(WORK)) { - Dependency.get(ManagedProfileController.class).addCallback(mProfileCallback); + managedProfileController.addCallback(mProfileCallback); } if (!mAutoTracker.isAdded(NIGHT) && ColorDisplayManager.isNightDisplayAvailable(mContext)) { - Dependency.get(ColorDisplayController.class).setListener(mColorDisplayCallback); + colorDisplayController.setListener(mColorDisplayCallback); } } @@ -92,11 +102,11 @@ public class AutoTileManager { mColorsSetting.setListening(false); } mAutoTracker.destroy(); - Dependency.get(HotspotController.class).removeCallback(mHotspotCallback); - Dependency.get(DataSaverController.class).removeCallback(mDataSaverListener); - Dependency.get(ManagedProfileController.class).removeCallback(mProfileCallback); + mHotspotController.removeCallback(mHotspotCallback); + mDataSaverController.removeCallback(mDataSaverListener); + mManagedProfileController.removeCallback(mProfileCallback); if (ColorDisplayManager.isNightDisplayAvailable(mContext)) { - Dependency.get(ColorDisplayController.class).setListener(null); + mColorDisplayController.setListener(null); } } @@ -109,7 +119,7 @@ public class AutoTileManager { @Override public void onManagedProfileChanged() { if (mAutoTracker.isAdded(WORK)) return; - if (Dependency.get(ManagedProfileController.class).hasActiveProfile()) { + if (mManagedProfileController.hasActiveProfile()) { mHost.addTile(WORK); mAutoTracker.setTileAdded(WORK); } @@ -129,8 +139,7 @@ public class AutoTileManager { if (isDataSaving) { mHost.addTile(SAVER); mAutoTracker.setTileAdded(SAVER); - mHandler.post(() -> Dependency.get(DataSaverController.class).removeCallback( - mDataSaverListener)); + mHandler.post(() -> mDataSaverController.removeCallback(mDataSaverListener)); } } }; @@ -142,8 +151,7 @@ public class AutoTileManager { if (enabled) { mHost.addTile(HOTSPOT); mAutoTracker.setTileAdded(HOTSPOT); - mHandler.post(() -> Dependency.get(HotspotController.class) - .removeCallback(mHotspotCallback)); + mHandler.post(() -> mHotspotController.removeCallback(mHotspotCallback)); } } }; @@ -170,8 +178,7 @@ public class AutoTileManager { if (mAutoTracker.isAdded(NIGHT)) return; mHost.addTile(NIGHT); mAutoTracker.setTileAdded(NIGHT); - mHandler.post(() -> Dependency.get(ColorDisplayController.class) - .setListener(null)); + mHandler.post(() -> mColorDisplayController.setListener(null)); } }; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index 24570aec9db4..f907b6523bef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java @@ -70,7 +70,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private SignalCallback mSignalCallback = new SignalCallback() { @Override public void setIsAirplaneMode(NetworkController.IconState icon) { - mCommandQueue.recomputeDisableFlags(true /* animate */); + mCommandQueue.recomputeDisableFlags(getContext().getDisplayId(), true /* animate */); } }; @@ -155,7 +155,10 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } @Override - public void disable(int state1, int state2, boolean animate) { + public void disable(int displayId, int state1, int state2, boolean animate) { + if (displayId != getContext().getDisplayId()) { + return; + } state1 = adjustDisableFlags(state1); final int old1 = mDisabled1; final int diff1 = state1 ^ old1; @@ -362,6 +365,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue @Override public void onDozingChanged(boolean isDozing) { - disable(mDisabled1, mDisabled1, false /* animate */); + disable(getContext().getDisplayId(), mDisabled1, mDisabled1, false /* animate */); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java index dd07ec4c27dd..1944c3f21444 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java @@ -25,8 +25,8 @@ import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.util.MathUtils; import android.provider.Settings; +import android.util.MathUtils; import android.util.TimeUtils; import com.android.systemui.Dependency; @@ -66,6 +66,7 @@ public class LightBarTransitionsController implements Dumpable, Callbacks, private float mDarkIntensity; private float mNextDarkIntensity; private float mDozeAmount; + private int mDisplayId; private final Runnable mTransitionDeferringDoneRunnable = new Runnable() { @Override public void run() { @@ -85,6 +86,7 @@ public class LightBarTransitionsController implements Dumpable, Callbacks, mStatusBarStateController.addCallback(this); mDozeAmount = mStatusBarStateController.getDozeAmount(); mContext = context; + mDisplayId = mContext.getDisplayId(); } public void destroy(Context context) { @@ -104,15 +106,18 @@ public class LightBarTransitionsController implements Dumpable, Callbacks, } @Override - public void appTransitionPending(boolean forced) { - if (mKeyguardMonitor.isKeyguardGoingAway() && !forced) { + public void appTransitionPending(int displayId, boolean forced) { + if (mDisplayId != displayId || mKeyguardMonitor.isKeyguardGoingAway() && !forced) { return; } mTransitionPending = true; } @Override - public void appTransitionCancelled() { + public void appTransitionCancelled(int displayId) { + if (mDisplayId != displayId) { + return; + } if (mTransitionPending && mTintChangePending) { mTintChangePending = false; animateIconTint(mPendingDarkIntensity, 0 /* delay */, getTintAnimationDuration()); @@ -121,8 +126,9 @@ public class LightBarTransitionsController implements Dumpable, Callbacks, } @Override - public void appTransitionStarting(long startTime, long duration, boolean forced) { - if (mKeyguardMonitor.isKeyguardGoingAway() && !forced) { + public void appTransitionStarting(int displayId, long startTime, long duration, + boolean forced) { + if (mDisplayId != displayId || mKeyguardMonitor.isKeyguardGoingAway() && !forced) { return; } if (mTransitionPending && mTintChangePending) { 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 270565be8bab..6d97d6724d40 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -18,6 +18,8 @@ import static android.app.StatusBarManager.NAVIGATION_HINT_BACK_ALT; import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN; import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; +import static android.app.StatusBarManager.WindowType; +import static android.app.StatusBarManager.WindowVisibleState; import static android.app.StatusBarManager.windowStateToString; import static com.android.systemui.recents.OverviewProxyService.OverviewProxyListener; @@ -60,7 +62,6 @@ import android.telecom.TelecomManager; import android.text.TextUtils; import android.util.Log; import android.view.Display; -import android.view.IWindowManager; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -69,7 +70,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; -import android.view.WindowManagerGlobal; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener; @@ -121,7 +121,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback /** Allow some time inbetween the long press for back and recents. */ private static final int LOCK_TO_APP_GESTURE_TOLERENCE = 200; - private static final long AUTOHIDE_TIMEOUT_MS = 2250; + private static final long AUTODIM_TIMEOUT_MS = 2250; private final AccessibilityManagerWrapper mAccessibilityManagerWrapper; protected final AssistManager mAssistManager; @@ -130,14 +130,13 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback protected NavigationBarView mNavigationBarView = null; - private int mNavigationBarWindowState = WINDOW_STATE_SHOWING; + private @WindowVisibleState int mNavigationBarWindowState = WINDOW_STATE_SHOWING; private int mNavigationIconHints = 0; private @TransitionMode int mNavigationBarMode; private AccessibilityManager mAccessibilityManager; private MagnificationContentObserver mMagnificationObserver; private ContentResolver mContentResolver; - private IWindowManager mWindowManagerService = WindowManagerGlobal.getWindowManagerService(); private int mDisabledFlags1; private int mDisabledFlags2; @@ -153,6 +152,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback private int mSystemUiVisibility; private LightBarController mLightBarController; + private AutoHideController mAutoHideController; private OverviewProxyService mOverviewProxyService; @@ -162,9 +162,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback private Handler mHandler = Dependency.get(Dependency.MAIN_HANDLER); - // last value sent to window manager - private int mLastDispatchedSystemUiVisibility = ~View.SYSTEM_UI_FLAG_VISIBLE; - private final OverviewProxyListener mOverviewProxyListener = new OverviewProxyListener() { @Override public void onConnectionChanged(boolean isConnected) { @@ -205,19 +202,12 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback if (visible) { // If the button will actually become visible and the navbar is about to hide, // tell the statusbar to keep it around for longer - touchAutoHide(); + mAutoHideController.touchAutoHide(); } }; private final Runnable mAutoDim = () -> getBarTransitions().setAutoDim(true); - private final Runnable mAutoHide = () -> { - int requested = mSystemUiVisibility & ~View.NAVIGATION_BAR_TRANSIENT; - if (mSystemUiVisibility != requested) { - notifySystemUiVisibilityChanged(requested); - } - }; - @Inject public NavigationBarFragment(AccessibilityManagerWrapper accessibilityManagerWrapper, DeviceProvisionedController deviceProvisionedController, MetricsLogger metricsLogger, @@ -376,8 +366,11 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback // ----- CommandQueue Callbacks ----- @Override - public void setImeWindowStatus(IBinder token, int vis, int backDisposition, + public void setImeWindowStatus(int displayId, IBinder token, int vis, int backDisposition, boolean showImeSwitcher) { + if (displayId != mDisplayId) { + return; + } boolean imeShown = (vis & InputMethodService.IME_VISIBLE) != 0; int hints = mNavigationIconHints; switch (backDisposition) { @@ -410,15 +403,17 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback } @Override - public void topAppWindowChanged(boolean showMenu) { - if (mNavigationBarView != null) { + public void topAppWindowChanged(int displayId, boolean showMenu) { + if (displayId == mDisplayId && mNavigationBarView != null) { mNavigationBarView.setMenuVisibility(showMenu); } } @Override - public void setWindowState(int window, int state) { - if (mNavigationBarView != null + public void setWindowState( + int displayId, @WindowType int window, @WindowVisibleState int state) { + if (displayId == mDisplayId + && mNavigationBarView != null && window == StatusBarManager.WINDOW_NAVIGATION_BAR && mNavigationBarWindowState != state) { mNavigationBarWindowState = state; @@ -463,15 +458,18 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback mNavigationBarMode = barMode; } checkNavBarModes(); - touchAutoHide(); + mAutoHideController.touchAutoHide(); mLightBarController.onNavigationVisibilityChanged(mSystemUiVisibility, 0 /* mask */, - true /* nbModeChanged */, mNavigationBarMode); + true /* nbModeChanged */, mNavigationBarMode); } @Override - public void setSystemUiVisibility(int vis, int fullscreenStackVis, int dockedStackVis, - int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) { + public void setSystemUiVisibility(int displayId, int vis, int fullscreenStackVis, + int dockedStackVis, int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) { + if (displayId != mDisplayId) { + return; + } final int oldVal = mSystemUiVisibility; final int newVal = (oldVal & ~mask) | (vis & mask); final int diff = newVal ^ oldVal; @@ -492,16 +490,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback mNavigationBarMode = nbMode; checkNavBarModes(); } - touchAutoHide(); - } - if ((vis & View.NAVIGATION_BAR_UNHIDE) != 0) { - mSystemUiVisibility &= ~View.NAVIGATION_BAR_UNHIDE; - } - - - // On the default display, just make StatusBar do this job. - if (!mIsOnDefaultDisplay) { - notifySystemUiVisibilityChanged(mSystemUiVisibility); + mAutoHideController.touchAutoHide(); } } mLightBarController.onNavigationVisibilityChanged( @@ -536,7 +525,10 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback } @Override - public void disable(int state1, int state2, boolean animate) { + public void disable(int displayId, int state1, int state2, boolean animate) { + if (displayId != mDisplayId) { + return; + } // Navigation bar flags are in both state1 and state2. final int masked = state1 & (StatusBarManager.DISABLE_HOME | StatusBarManager.DISABLE_RECENT @@ -664,7 +656,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback } private boolean onNavigationTouch(View v, MotionEvent event) { - checkUserAutoHide(event); + mAutoHideController.checkUserAutoHide(event); return false; } @@ -854,77 +846,15 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback mNavigationBarView.setAccessibilityButtonState(showAccessibilityButton, targetSelection); } - private void touchAutoHide() { - // There is status bar on default display. Thus the hide animations should apply on both - // status/navigation bar. - if (mIsOnDefaultDisplay) { - mStatusBar.touchAutoHide(); - } else { - touchAutoHideInternal(); - } - } - - private void touchAutoHideInternal() { - // update transient bar autoHide. - if (isSemiTransparent()) { - scheduleAutoHide(); - } else { - cancelAutoHide(); - } - } - - private void checkUserAutoHide(MotionEvent event) { - // There is status bar on default display. Thus the hide animations should apply on both - // status/navigation bar. - if (mIsOnDefaultDisplay) { - mStatusBar.checkUserAutoHide(event); - } else { - checkUserAutoHideInternal(event); - } - } - - private void checkUserAutoHideInternal(MotionEvent event) { - if ((mSystemUiVisibility & View.NAVIGATION_BAR_TRANSIENT) != 0 - // a transient bar is revealed - && event.getAction() == MotionEvent.ACTION_OUTSIDE // touch outside the source bar. - && event.getX() == 0 && event.getY() == 0) { // a touch outside both bars. - userAutoHide(); - } - } - - private void userAutoHide() { - cancelAutoHide(); - mHandler.postDelayed(mAutoHide, 350); // longer than app gesture -> flag clear. - } - - private void cancelAutoHide() { - mHandler.removeCallbacks(mAutoHide); - } - - private void scheduleAutoHide() { - cancelAutoHide(); - mHandler.postDelayed(mAutoHide, AUTOHIDE_TIMEOUT_MS); - } - - private void notifySystemUiVisibilityChanged(int vis) { - try { - if (mLastDispatchedSystemUiVisibility != vis) { - mWindowManagerService.statusBarVisibilityChanged(mDisplayId, vis); - mLastDispatchedSystemUiVisibility = vis; - } - } catch (RemoteException ex) { - } - } - // ----- Methods that DisplayNavigationBarController talks to ----- - /** Applys auto dimming animation on navigation bar when touched. */ + /** Applies auto dimming animation on navigation bar when touched. */ public void touchAutoDim() { getBarTransitions().setAutoDim(false); mHandler.removeCallbacks(mAutoDim); int state = Dependency.get(StatusBarStateController.class).getState(); if (state != StatusBarState.KEYGUARD && state != StatusBarState.SHADE_LOCKED) { - mHandler.postDelayed(mAutoDim, AUTOHIDE_TIMEOUT_MS); + mHandler.postDelayed(mAutoDim, AUTODIM_TIMEOUT_MS); } } @@ -933,6 +863,12 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback mLightBarController.setNavigationBar(mNavigationBarView.getLightTransitionsController()); } + /** Sets {@link AutoHideController} to the navigation bar. */ + public void setAutoHideController(AutoHideController autoHideController) { + mAutoHideController = autoHideController; + mAutoHideController.setNavigationBar(this); + } + public boolean isSemiTransparent() { return mNavigationBarMode == MODE_SEMI_TRANSPARENT; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelper.java index 3839ed5d5d88..af3257ae423e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelper.java @@ -220,15 +220,12 @@ public class NotificationGroupAlertTransferHelper implements OnHeadsUpChangedLis @Override public void onEntryRemoved( @Nullable Entry entry, - String key, - StatusBarNotification old, NotificationVisibility visibility, - boolean lifetimeExtended, boolean removedByUser) { // Removes any alerts pending on this entry. Note that this will not stop any inflation // tasks started by a transfer, so this should only be used as clean-up for when // inflation is stopped and the pending alert no longer needs to happen. - mPendingAlerts.remove(key); + mPendingAlerts.remove(entry.key); } }; 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 1b18c6cf8440..16576ad6e3e1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -312,6 +312,7 @@ public class NotificationPanelView extends PanelView implements Dependency.get(NotificationLockscreenUserManager.class); private final ShadeController mShadeController = Dependency.get(ShadeController.class); + private int mDisplayId; public NotificationPanelView(Context context, AttributeSet attrs) { super(context, attrs); @@ -323,6 +324,7 @@ public class NotificationPanelView extends PanelView implements mAlphaPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); setPanelAlpha(255, false /* animate */); mCommandQueue = getComponent(context, CommandQueue.class); + mDisplayId = context.getDisplayId(); } private void setStatusBar(StatusBar bar) { @@ -2596,7 +2598,7 @@ public class NotificationPanelView extends PanelView implements } if (showIconsWhenExpanded != mShowIconsWhenExpanded) { mShowIconsWhenExpanded = showIconsWhenExpanded; - mCommandQueue.recomputeDisableFlags(false); + mCommandQueue.recomputeDisableFlags(mDisplayId, false); } } @@ -2803,6 +2805,11 @@ public class NotificationPanelView extends PanelView implements if (animatePulse) { mAnimateNextPositionUpdate = true; } + // Do not animate the clock when waking up from a pulse. + // The height callback will take care of pushing the clock to the right position. + if (!mPulsing && !mDozing) { + mAnimateNextPositionUpdate = false; + } mNotificationStackScroller.setPulsing(pulsing, animatePulse); mKeyguardStatusView.setPulsing(pulsing, animatePulse); mKeyguardBottomArea.setPulsing(pulsing, animatePulse); @@ -2856,7 +2863,7 @@ public class NotificationPanelView extends PanelView implements if (hideIcons != mHideIconsDuringNotificationLaunch) { mHideIconsDuringNotificationLaunch = hideIcons; if (!hideIcons) { - mCommandQueue.recomputeDisableFlags(true /* animate */); + mCommandQueue.recomputeDisableFlags(mDisplayId, true /* animate */); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index d6f2fd7a4eee..43c35f11d9e5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -736,9 +736,12 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, }; @Override - public void appTransitionStarting(long startTime, long duration, boolean forced) { - updateManagedProfile(); - updateForegroundInstantApps(); + public void appTransitionStarting(int displayId, long startTime, long duration, + boolean forced) { + if (mContext.getDisplayId() == displayId) { + updateManagedProfile(); + updateForegroundInstantApps(); + } } @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 9f0eec41bafc..977e33688831 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -20,9 +20,10 @@ import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; +import static android.app.StatusBarManager.WindowType; +import static android.app.StatusBarManager.WindowVisibleState; import static android.app.StatusBarManager.windowStateToString; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY; -import static android.view.Display.DEFAULT_DISPLAY; import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_ASLEEP; import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE; @@ -79,6 +80,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; +import android.os.Looper; import android.os.Message; import android.os.PowerManager; import android.os.RemoteException; @@ -289,10 +291,6 @@ public class StatusBar extends SystemUI implements DemoMode, protected static final boolean CLOSE_PANEL_WHEN_EMPTIED = true; - private static final int STATUS_OR_NAV_TRANSIENT = - View.STATUS_BAR_TRANSIENT | View.NAVIGATION_BAR_TRANSIENT; - private static final long AUTOHIDE_TIMEOUT_MS = 2250; - /** * The delay to reset the hint text when the hint animation is finished running. */ @@ -341,6 +339,8 @@ public class StatusBar extends SystemUI implements DemoMode, protected BiometricUnlockController mBiometricUnlockController; private LightBarController mLightBarController; protected LockscreenWallpaper mLockscreenWallpaper; + @VisibleForTesting + protected AutoHideController mAutoHideController; private int mNaturalBarHeight = -1; @@ -405,9 +405,6 @@ public class StatusBar extends SystemUI implements DemoMode, private final Rect mLastFullscreenStackBounds = new Rect(); private final Rect mLastDockedStackBounds = new Rect(); - // last value sent to window manager - private int mLastDispatchedSystemUiVisibility = ~View.SYSTEM_UI_FLAG_VISIBLE; - private final DisplayMetrics mDisplayMetrics = Dependency.get(DisplayMetrics.class); // XXX: gesture research @@ -447,7 +444,6 @@ public class StatusBar extends SystemUI implements DemoMode, protected final H mHandler = createHandler(); private int mInteractingWindows; - private boolean mAutoHideSuspended; private @TransitionMode int mStatusBarMode; private ViewMediatorCallback mKeyguardViewMediatorCallback; @@ -455,13 +451,6 @@ public class StatusBar extends SystemUI implements DemoMode, protected DozeScrimController mDozeScrimController; private final UiOffloadThread mUiOffloadThread = Dependency.get(UiOffloadThread.class); - private final Runnable mAutoHide = () -> { - int requested = mSystemUiVisibility & ~STATUS_OR_NAV_TRANSIENT; - if (mSystemUiVisibility != requested) { - notifySystemUiVisibilityChanged(requested); - } - }; - protected boolean mDozing; private boolean mDozingRequested; @@ -584,6 +573,7 @@ public class StatusBar extends SystemUI implements DemoMode, mEntryManager.updateNotifications(); } }; + private final Handler mMainThreadHandler = new Handler(Looper.getMainLooper()); private HeadsUpAppearanceController mHeadsUpAppearanceController; private boolean mVibrateOnOpening; @@ -656,6 +646,7 @@ public class StatusBar extends SystemUI implements DemoMode, ServiceManager.checkService(DreamService.DREAM_SERVICE)); mDisplay = mWindowManager.getDefaultDisplay(); + mDisplayId = mDisplay.getDisplayId(); updateDisplaySize(); Resources res = mContext.getResources(); @@ -711,11 +702,11 @@ public class StatusBar extends SystemUI implements DemoMode, // Set up the initial notification state. This needs to happen before CommandQueue.disable() setUpPresenter(); - setSystemUiVisibility(switches[1], switches[7], switches[8], 0xffffffff, + setSystemUiVisibility(mDisplayId, switches[1], switches[7], switches[8], 0xffffffff, fullscreenStackBounds, dockedStackBounds); - topAppWindowChanged(switches[2] != 0); + topAppWindowChanged(mDisplayId, switches[2] != 0); // StatusBarManagerService has a back up of IME token and it's restored here. - setImeWindowStatus(binders.get(0), switches[3], switches[4], switches[5] != 0); + setImeWindowStatus(mDisplayId, binders.get(0), switches[3], switches[4], switches[5] != 0); // Set up the initial icon state int N = iconSlots.size(); @@ -902,6 +893,9 @@ public class StatusBar extends SystemUI implements DemoMode, } }); + mAutoHideController = Dependency.get(AutoHideController.class); + mAutoHideController.setStatusBar(this); + mLightBarController = Dependency.get(LightBarController.class); ScrimView scrimBehind = mStatusBarWindow.findViewById(R.id.scrim_behind); @@ -1061,7 +1055,7 @@ public class StatusBar extends SystemUI implements DemoMode, * @param state2 disable2 flags */ protected void setUpDisableFlags(int state1, int state2) { - mCommandQueue.disable(state1, state2, false /* animate */); + mCommandQueue.disable(mDisplayId, state1, state2, false /* animate */); } @Override @@ -1100,7 +1094,7 @@ public class StatusBar extends SystemUI implements DemoMode, */ protected View.OnTouchListener getStatusBarWindowTouchListener() { return (v, event) -> { - checkUserAutoHide(event); + mAutoHideController.checkUserAutoHide(event); mRemoteInputManager.checkRemoteInputOutside(event); if (event.getAction() == MotionEvent.ACTION_DOWN) { if (mExpandedVisible) { @@ -1235,8 +1229,7 @@ public class StatusBar extends SystemUI implements DemoMode, } int dockSide = WindowManagerProxy.getInstance().getDockSide(); if (dockSide == WindowManager.DOCKED_INVALID) { - final int navbarPos = WindowManagerWrapper.getInstance().getNavBarPosition( - mDisplay.getDisplayId()); + final int navbarPos = WindowManagerWrapper.getInstance().getNavBarPosition(mDisplayId); if (navbarPos == NAV_BAR_POS_INVALID) { return false; } @@ -1345,7 +1338,10 @@ public class StatusBar extends SystemUI implements DemoMode, * State is one or more of the DISABLE constants from StatusBarManager. */ @Override - public void disable(int state1, int state2, boolean animate) { + public void disable(int displayId, int state1, int state2, boolean animate) { + if (displayId != mDisplayId) { + return; + } state2 = mRemoteInputQuickSettingsDisabler.adjustDisableFlags(state2); animate &= mStatusBarWindowState != WINDOW_STATE_HIDDEN; @@ -1623,10 +1619,10 @@ public class StatusBar extends SystemUI implements DemoMode, mWereIconsJustHidden = true; mHandler.postDelayed(() -> { mWereIconsJustHidden = false; - mCommandQueue.recomputeDisableFlags(true); + mCommandQueue.recomputeDisableFlags(mDisplayId, true); }, 500); } else { - mCommandQueue.recomputeDisableFlags(animate); + mCommandQueue.recomputeDisableFlags(mDisplayId, animate); } } if (shouldHideIconsForBouncer) { @@ -1792,7 +1788,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStatusBarWindowController.setPanelVisible(true); visibilityChanged(true); - mCommandQueue.recomputeDisableFlags(!force /* animate */); + mCommandQueue.recomputeDisableFlags(mDisplayId, !force /* animate */); setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true); } @@ -1965,7 +1961,7 @@ public class StatusBar extends SystemUI implements DemoMode, Log.d(TAG, "Not showing bouncer due to activity showing over lockscreen"); } mCommandQueue.recomputeDisableFlags( - mNotificationPanel.hideStatusBarIconsWhenExpanded() /* animate */); + mDisplayId, mNotificationPanel.hideStatusBarIconsWhenExpanded() /* animate */); // Trimming will happen later if Keyguard is showing - doing it here might cause a jank in // the bouncer appear animation. @@ -2022,7 +2018,11 @@ public class StatusBar extends SystemUI implements DemoMode, } @Override // CommandQueue - public void setWindowState(int window, int state) { + public void setWindowState( + int displayId, @WindowType int window, @WindowVisibleState int state) { + if (displayId != mDisplayId) { + return; + } boolean showing = state == WINDOW_STATE_SHOWING; if (mStatusBarWindow != null && window == StatusBarManager.WINDOW_STATUS_BAR @@ -2041,14 +2041,17 @@ public class StatusBar extends SystemUI implements DemoMode, } @Override // CommandQueue - public void setSystemUiVisibility(int vis, int fullscreenStackVis, int dockedStackVis, - int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) { + public void setSystemUiVisibility(int displayId, int vis, int fullscreenStackVis, + int dockedStackVis, int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) { + if (displayId != mDisplayId) { + return; + } final int oldVal = mSystemUiVisibility; final int newVal = (oldVal&~mask) | (vis&mask); final int diff = newVal ^ oldVal; if (DEBUG) Log.d(TAG, String.format( - "setSystemUiVisibility vis=%s mask=%s oldVal=%s newVal=%s diff=%s", - Integer.toHexString(vis), Integer.toHexString(mask), + "setSystemUiVisibility displayId=%d vis=%s mask=%s oldVal=%s newVal=%s diff=%s", + displayId, Integer.toHexString(vis), Integer.toHexString(mask), Integer.toHexString(oldVal), Integer.toHexString(newVal), Integer.toHexString(diff))); boolean sbModeChanged = false; @@ -2062,7 +2065,6 @@ public class StatusBar extends SystemUI implements DemoMode, // ready to unhide if ((vis & View.STATUS_BAR_UNHIDE) != 0) { - mSystemUiVisibility &= ~View.STATUS_BAR_UNHIDE; mNoAnimationOnNextBarModeChange = true; } @@ -2073,17 +2075,9 @@ public class StatusBar extends SystemUI implements DemoMode, if (sbModeChanged && sbMode != mStatusBarMode) { mStatusBarMode = sbMode; checkBarModes(); - touchAutoHide(); - } - - if ((vis & View.NAVIGATION_BAR_UNHIDE) != 0) { - mSystemUiVisibility &= ~View.NAVIGATION_BAR_UNHIDE; + mAutoHideController.touchAutoHide(); } - - // send updated sysui visibility to window manager - notifySystemUiVisibilityChanged(mSystemUiVisibility); } - mLightBarController.onSystemUiVisibilityChanged(fullscreenStackVis, dockedStackVis, mask, fullscreenStackBounds, dockedStackBounds, sbModeChanged, mStatusBarMode); } @@ -2111,16 +2105,6 @@ public class StatusBar extends SystemUI implements DemoMode, } } - void touchAutoHide() { - // update transient bar auto hide - if (mStatusBarMode == MODE_SEMI_TRANSPARENT - || mNavigationBarController.isSemiTransparent(DEFAULT_DISPLAY)) { - scheduleAutoHide(); - } else { - cancelAutoHide(); - } - } - protected @TransitionMode int computeStatusBarMode(int oldVal, int newVal) { return computeBarMode(oldVal, newVal); } @@ -2159,7 +2143,7 @@ public class StatusBar extends SystemUI implements DemoMode, if (mDemoMode) return; if (mStatusBarView != null) checkBarMode(mStatusBarMode, mStatusBarWindowState, getStatusBarTransitions()); - mNavigationBarController.checkNavBarModes(DEFAULT_DISPLAY); + mNavigationBarController.checkNavBarModes(mDisplayId); mNoAnimationOnNextBarModeChange = false; } @@ -2168,7 +2152,8 @@ public class StatusBar extends SystemUI implements DemoMode, mNotificationPanel.setQsScrimEnabled(scrimEnabled); } - void checkBarMode(@TransitionMode int mode, int windowState, BarTransitions transitions) { + void checkBarMode(@TransitionMode int mode, @WindowVisibleState int windowState, + BarTransitions transitions) { final boolean anim = !mNoAnimationOnNextBarModeChange && mDeviceInteractive && windowState != WINDOW_STATE_HIDDEN; transitions.transitionTo(mode, anim); @@ -2178,7 +2163,7 @@ public class StatusBar extends SystemUI implements DemoMode, if (mStatusBarView != null) { mStatusBarView.getBarTransitions().finishAnimations(); } - mNavigationBarController.finishBarAnimations(DEFAULT_DISPLAY); + mNavigationBarController.finishBarAnimations(mDisplayId); } private final Runnable mCheckBarModes = this::checkBarModes; @@ -2189,13 +2174,13 @@ public class StatusBar extends SystemUI implements DemoMode, ? (mInteractingWindows | barWindow) : (mInteractingWindows & ~barWindow); if (mInteractingWindows != 0) { - suspendAutoHide(); + mAutoHideController.suspendAutoHide(); } else { - resumeSuspendedAutoHide(); + mAutoHideController.resumeSuspendedAutoHide(); } // manually dismiss the volume panel when interacting with the nav bar if (changing && interacting && barWindow == StatusBarManager.WINDOW_NAVIGATION_BAR) { - mNavigationBarController.touchAutoDim(DEFAULT_DISPLAY); + mNavigationBarController.touchAutoDim(mDisplayId); dismissVolumeDialog(); } checkBarModes(); @@ -2207,44 +2192,6 @@ public class StatusBar extends SystemUI implements DemoMode, } } - private void resumeSuspendedAutoHide() { - if (mAutoHideSuspended) { - scheduleAutoHide(); - mHandler.postDelayed(mCheckBarModes, 500); // longer than home -> launcher - } - } - - private void suspendAutoHide() { - mHandler.removeCallbacks(mAutoHide); - mHandler.removeCallbacks(mCheckBarModes); - mAutoHideSuspended = (mSystemUiVisibility & STATUS_OR_NAV_TRANSIENT) != 0; - } - - private void cancelAutoHide() { - mAutoHideSuspended = false; - mHandler.removeCallbacks(mAutoHide); - } - - private void scheduleAutoHide() { - cancelAutoHide(); - mHandler.postDelayed(mAutoHide, AUTOHIDE_TIMEOUT_MS); - } - - void checkUserAutoHide(MotionEvent event) { - if ((mSystemUiVisibility & STATUS_OR_NAV_TRANSIENT) != 0 // a transient bar is revealed - && event.getAction() == MotionEvent.ACTION_OUTSIDE // touch outside the source bar - && event.getX() == 0 && event.getY() == 0 // a touch outside both bars - && !mRemoteInputManager.getController() - .isRemoteInputActive()) { // not due to typing in IME - userAutoHide(); - } - } - - private void userAutoHide() { - cancelAutoHide(); - mHandler.postDelayed(mAutoHide, 350); // longer than app gesture -> flag clear - } - private boolean areLightsOn() { return 0 == (mSystemUiVisibility & View.SYSTEM_UI_FLAG_LOW_PROFILE); } @@ -2252,29 +2199,21 @@ public class StatusBar extends SystemUI implements DemoMode, public void setLightsOn(boolean on) { Log.v(TAG, "setLightsOn(" + on + ")"); if (on) { - setSystemUiVisibility(0, 0, 0, View.SYSTEM_UI_FLAG_LOW_PROFILE, + setSystemUiVisibility(mDisplayId, 0, 0, 0, View.SYSTEM_UI_FLAG_LOW_PROFILE, mLastFullscreenStackBounds, mLastDockedStackBounds); } else { - setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE, 0, 0, + setSystemUiVisibility(mDisplayId, View.SYSTEM_UI_FLAG_LOW_PROFILE, 0, 0, View.SYSTEM_UI_FLAG_LOW_PROFILE, mLastFullscreenStackBounds, mLastDockedStackBounds); } } - private void notifySystemUiVisibilityChanged(int vis) { - try { - if (mLastDispatchedSystemUiVisibility != vis) { - mWindowManagerService.statusBarVisibilityChanged(DEFAULT_DISPLAY, vis); - mLastDispatchedSystemUiVisibility = vis; - } - } catch (RemoteException ex) { - } - } - @Override - public void topAppWindowChanged(boolean showMenu) { + public void topAppWindowChanged(int displayId, boolean showMenu) { + if (mDisplayId != displayId) return; if (SPEW) { - Log.d(TAG, (showMenu?"showing":"hiding") + " the MENU button"); + Log.d(TAG, "display#" + displayId + ": " + + (showMenu ? "showing" : "hiding") + " the MENU button"); } // See above re: lights-out policy for legacy apps. @@ -2963,7 +2902,7 @@ public class StatusBar extends SystemUI implements DemoMode, if (mStatusBarView != null) { mStatusBarView.getBarTransitions().transitionTo(barMode, animate); } - mNavigationBarController.transitionTo(DEFAULT_DISPLAY, barMode, animate); + mNavigationBarController.transitionTo(mDisplayId, barMode, animate); } } if (modeChange || command.equals(COMMAND_OPERATOR)) { @@ -3101,7 +3040,7 @@ public class StatusBar extends SystemUI implements DemoMode, .setDuration(FADE_KEYGUARD_DURATION) .withLayer() .withEndAction(this::onLaunchTransitionFadingEnded); - mCommandQueue.appTransitionStarting(SystemClock.uptimeMillis(), + mCommandQueue.appTransitionStarting(mDisplayId, SystemClock.uptimeMillis(), LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION, true); }; if (mNotificationPanel.isLaunchTransitionRunning()) { @@ -3191,7 +3130,7 @@ public class StatusBar extends SystemUI implements DemoMode, // Disable layout transitions in navbar for this transition because the load is just // too heavy for the CPU and GPU on any device. - mNavigationBarController.disableAnimationsDuringHide(DEFAULT_DISPLAY, delay); + mNavigationBarController.disableAnimationsDuringHide(mDisplayId, delay); } else if (!mNotificationPanel.isCollapsing()) { instantCollapseNotificationPanel(); } @@ -3224,7 +3163,7 @@ public class StatusBar extends SystemUI implements DemoMode, // Treat Keyguard exit animation as an app transition to achieve nice transition for status // bar. mKeyguardMonitor.notifyKeyguardGoingAway(true); - mCommandQueue.appTransitionPending(true); + mCommandQueue.appTransitionPending(mDisplayId, true /* forced */); } /** @@ -3235,11 +3174,11 @@ public class StatusBar extends SystemUI implements DemoMode, * @param fadeoutDuration the duration of the exit animation, in milliseconds */ public void setKeyguardFadingAway(long startTime, long delay, long fadeoutDuration) { - mCommandQueue.appTransitionStarting(startTime + fadeoutDuration + mCommandQueue.appTransitionStarting(mDisplayId, startTime + fadeoutDuration - LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION, LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION, true); - mCommandQueue.recomputeDisableFlags(fadeoutDuration > 0 /* animate */); - mCommandQueue.appTransitionStarting( + mCommandQueue.recomputeDisableFlags(mDisplayId, fadeoutDuration > 0 /* animate */); + mCommandQueue.appTransitionStarting(mDisplayId, startTime - LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION, LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION, true); mKeyguardMonitor.notifyKeyguardFadingAway(delay, fadeoutDuration); @@ -3365,7 +3304,7 @@ public class StatusBar extends SystemUI implements DemoMode, // Make our window larger and the panel expanded. makeExpandedVisible(true); mNotificationPanel.expand(false /* animate */); - mCommandQueue.recomputeDisableFlags(false /* animate */); + mCommandQueue.recomputeDisableFlags(mDisplayId, false /* animate */); } @Override @@ -3421,7 +3360,7 @@ public class StatusBar extends SystemUI implements DemoMode, updateReportRejectedTouchVisibility(); updateDozing(); updateTheme(); - mNavigationBarController.touchAutoDim(DEFAULT_DISPLAY); + mNavigationBarController.touchAutoDim(mDisplayId); Trace.beginSection("StatusBar#updateKeyguardState"); if (mState == StatusBarState.KEYGUARD) { mKeyguardIndicationController.setVisible(true); @@ -3606,7 +3545,7 @@ public class StatusBar extends SystemUI implements DemoMode, mBouncerShowing = bouncerShowing; if (mStatusBarView != null) mStatusBarView.setBouncerShowing(bouncerShowing); updateHideIconsForBouncer(true /* animate */); - mCommandQueue.recomputeDisableFlags(true /* animate */); + mCommandQueue.recomputeDisableFlags(mDisplayId, true /* animate */); updateScrimController(); } @@ -3731,13 +3670,17 @@ public class StatusBar extends SystemUI implements DemoMode, } @Override - public void appTransitionCancelled() { - getComponent(Divider.class).onAppTransitionFinished(); + public void appTransitionCancelled(int displayId) { + if (displayId == mDisplayId) { + getComponent(Divider.class).onAppTransitionFinished(); + } } @Override - public void appTransitionFinished() { - getComponent(Divider.class).onAppTransitionFinished(); + public void appTransitionFinished(int displayId) { + if (displayId == mDisplayId) { + getComponent(Divider.class).onAppTransitionFinished(); + } } @Override @@ -4133,6 +4076,7 @@ public class StatusBar extends SystemUI implements DemoMode, private IDreamManager mDreamManager; protected Display mDisplay; + private int mDisplayId; protected Recents mRecents; @@ -4260,7 +4204,7 @@ public class StatusBar extends SystemUI implements DemoMode, // Immediately update the icon hidden state, since that should only apply if we're // staying fullscreen. mWereIconsJustHidden = false; - mCommandQueue.recomputeDisableFlags(true); + mCommandQueue.recomputeDisableFlags(mDisplayId, true); } updateHideIconsForBouncer(true /* animate */); } @@ -4319,7 +4263,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void startPendingIntentDismissingKeyguard( - final PendingIntent intent, @Nullable final Runnable intentSentCallback) { + final PendingIntent intent, @Nullable final Runnable intentSentUiThreadCallback) { final boolean afterKeyguardGone = intent.isActivity() && PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(), mLockscreenUserManager.getCurrentUserId()); @@ -4338,12 +4282,16 @@ public class StatusBar extends SystemUI implements DemoMode, if (intent.isActivity()) { mAssistManager.hideAssist(); } - if (intentSentCallback != null) { - intentSentCallback.run(); + if (intentSentUiThreadCallback != null) { + postOnUiThread(intentSentUiThreadCallback); } }, afterKeyguardGone); } + private void postOnUiThread(Runnable runnable) { + mMainThreadHandler.post(runnable); + } + public static Bundle getActivityOptions(@Nullable RemoteAnimationAdapter animationAdapter) { ActivityOptions options; if (animationAdapter != null) { @@ -4460,4 +4408,8 @@ public class StatusBar extends SystemUI implements DemoMode, public interface StatusBarInjector { void createStatusBar(StatusBar statusbar); } + + public @TransitionMode int getStatusBarMode() { + return mStatusBarMode; + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java index 7b7bcb448022..fb3157a128d6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java @@ -43,6 +43,7 @@ import com.android.internal.widget.MessagingGroup; import com.android.internal.widget.MessagingMessage; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.Dependency; +import com.android.systemui.ForegroundServiceNotificationListener; import com.android.systemui.InitController; import com.android.systemui.R; import com.android.systemui.plugins.ActivityStarter; @@ -195,14 +196,10 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, @Override public void onEntryRemoved( @Nullable Entry entry, - String key, - StatusBarNotification old, NotificationVisibility visibility, - boolean lifetimeExtended, boolean removedByUser) { - if (!lifetimeExtended) { - StatusBarNotificationPresenter.this.onNotificationRemoved(key, old); - } + StatusBarNotificationPresenter.this.onNotificationRemoved( + entry.key, entry.notification); if (removedByUser) { maybeEndAmbientPulse(); } @@ -228,6 +225,10 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, mVisualStabilityManager.setUpWithPresenter(this); gutsManager.setUpWithPresenter(this, notifListContainer, mCheckSaveListener, mOnSettingsClickListener); + // ForegroundServiceControllerListener adds its listener in its constructor + // but we need to request it here in order for it to be instantiated. + // TODO: figure out how to do this correctly once Dependency.get() is gone. + Dependency.get(ForegroundServiceNotificationListener.class); onUserSwitched(mLockscreenUserManager.getCurrentUserId()); }); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java index 116ecc8ddeb5..3ddfc0c81c60 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java @@ -238,8 +238,10 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks { } @Override - public void disable(int state1, int state2, boolean animate) { - mDisabled2 = state2; + public void disable(int displayId, int state1, int state2, boolean animate) { + if (displayId == mContext.getDisplayId()) { + mDisabled2 = state2; + } } protected class ChallengeReceiver extends BroadcastReceiver { 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 5eb3e8950690..de7ef3ba645d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -299,7 +299,10 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C } @Override - public void disable(int state1, int state2, boolean animate) { + public void disable(int displayId, int state1, int state2, boolean animate) { + if (displayId != getDisplay().getDisplayId()) { + return; + } boolean clockVisibleByPolicy = (state1 & StatusBarManager.DISABLE_CLOCK) == 0; if (clockVisibleByPolicy != mClockVisibleByPolicy) { setClockVisibilityByPolicy(clockVisibleByPolicy); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index 2c756ceb1b48..d4049826a50a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java @@ -33,6 +33,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.SystemClock; import android.util.AttributeSet; +import android.util.Log; import android.util.TypedValue; import android.view.HapticFeedbackConstants; import android.view.InputDevice; @@ -304,6 +305,10 @@ public class KeyButtonView extends ImageView implements ButtonInterface { .setSubtype(mCode) .addTaggedData(MetricsEvent.FIELD_NAV_ACTION, action) .addTaggedData(MetricsEvent.FIELD_FLAGS, flags)); + // TODO(b/122195391): Added logs to make sure sysui is sending back button events + if (mCode == KeyEvent.KEYCODE_BACK && flags != KeyEvent.FLAG_LONG_PRESS) { + Log.i(TAG, "Back button event: " + KeyEvent.actionToString(action)); + } final int repeatCount = (flags & KeyEvent.FLAG_LONG_PRESS) != 0 ? 1 : 0; final KeyEvent ev = new KeyEvent(mDownTime, when, action, mCode, repeatCount, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.java index 630bd18c6ad6..2b602742e309 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.java @@ -82,6 +82,6 @@ public class RemoteInputQuickSettingsDisabler * to modify the disable flags according to the status of mRemoteInputActive and misLandscape. */ private void recomputeDisableFlags() { - mCommandQueue.recomputeDisableFlags(true); + mCommandQueue.recomputeDisableFlags(mContext.getDisplayId(), true); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java index 4fa8321fa1e9..f85d8038ab3f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java @@ -16,8 +16,6 @@ import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.InsetDrawable; import android.graphics.drawable.RippleDrawable; import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; import android.text.Layout; import android.text.TextPaint; import android.text.method.TransformationMethod; @@ -65,7 +63,6 @@ public class SmartReplyView extends ViewGroup { private final SmartReplyConstants mConstants; private final KeyguardDismissUtil mKeyguardDismissUtil; private final NotificationRemoteInputManager mRemoteInputManager; - private final Handler mMainThreadHandler = new Handler(Looper.getMainLooper()); /** * The upper bound for the height of this view in pixels. Notifications are automatically @@ -311,8 +308,7 @@ public class SmartReplyView extends ViewGroup { () -> { smartReplyController.smartActionClicked( entry, actionIndex, action, smartActions.fromAssistant); - postOnUiThread(() -> - headsUpManager.removeNotification(entry.key, true)); + headsUpManager.removeNotification(entry.key, true); })); // TODO(b/119010281): handle accessibility @@ -323,10 +319,6 @@ public class SmartReplyView extends ViewGroup { return button; } - private void postOnUiThread(Runnable runnable) { - mMainThreadHandler.post(runnable); - } - @Override public LayoutParams generateLayoutParams(AttributeSet attrs) { return new LayoutParams(mContext, attrs); diff --git a/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java b/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java index 59aa52242f88..faebf60dc688 100644 --- a/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java +++ b/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java @@ -26,6 +26,7 @@ import android.view.View; import com.android.systemui.SystemUIFactory; import com.android.systemui.qs.QSFooterImpl; import com.android.systemui.qs.QuickStatusBarHeader; +import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -112,6 +113,11 @@ public class InjectionInflationController { * Creates the QSFooterImpl. */ QSFooterImpl createQsFooter(); + + /** + * Creates the NotificationStackScrollLayout. + */ + NotificationStackScrollLayout createNotificationStackScrollLayout(); } /** diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index 490cdd5ce9bd..6b4f7edd54fe 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java @@ -69,10 +69,13 @@ public class Utils { /** * Sets visibility of this {@link View} given the states passed from - * {@link com.android.systemui.statusbar.CommandQueue.Callbacks#disable(int, int)}. + * {@link com.android.systemui.statusbar.CommandQueue.Callbacks#disable(int, int, int)}. */ @Override - public void disable(int state1, int state2, boolean animate) { + public void disable(int displayId, int state1, int state2, boolean animate) { + if (displayId != mView.getDisplay().getDisplayId()) { + return; + } final boolean disabled = ((state1 & mMask1) != 0) || ((state2 & mMask2) != 0); if (disabled == mDisabled) return; mDisabled = disabled; diff --git a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java index 3426e117ab13..61bfa758ad79 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java @@ -69,4 +69,10 @@ public class DependencyTest extends SysuiTestCase { mDependency.onConfigurationChanged(null); verify(d).onConfigurationChanged(eq(null)); } + + @Test + public void testInitDependency() { + Dependency.clearDependencies(); + Dependency.initDependencies(mContext); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java index f278a17d0637..f8912bcca302 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java @@ -22,6 +22,7 @@ import static junit.framework.Assert.assertNull; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.annotation.UserIdInt; @@ -35,197 +36,95 @@ import android.support.test.runner.AndroidJUnit4; import android.widget.RemoteViews; import com.android.internal.messages.nano.SystemMessageProto; +import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.NotificationEntryListener; +import com.android.systemui.statusbar.notification.NotificationEntryManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; @SmallTest @RunWith(AndroidJUnit4.class) public class ForegroundServiceControllerTest extends SysuiTestCase { - public static @UserIdInt int USERID_ONE = 10; // UserManagerService.MIN_USER_ID; - public static @UserIdInt int USERID_TWO = USERID_ONE + 1; + @UserIdInt private static final int USERID_ONE = 10; // UserManagerService.MIN_USER_ID; + @UserIdInt private static final int USERID_TWO = USERID_ONE + 1; - private ForegroundServiceController fsc; + private ForegroundServiceController mFsc; + private ForegroundServiceNotificationListener mListener; + private NotificationEntryListener mEntryListener; @Before public void setUp() throws Exception { - fsc = new ForegroundServiceControllerImpl(mContext); - } - - @Test - public void testNotificationCRUD_dungeon() { - StatusBarNotification sbn_user1_app1_fg = makeMockFgSBN(USERID_ONE, "com.example.app1"); - StatusBarNotification sbn_user2_app2_fg = makeMockFgSBN(USERID_TWO, "com.example.app2"); - StatusBarNotification sbn_user1_app3_fg = makeMockFgSBN(USERID_ONE, "com.example.app3"); - StatusBarNotification sbn_user1_app1 = makeMockSBN(USERID_ONE, "com.example.app1", - 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); - StatusBarNotification sbn_user2_app1 = makeMockSBN(USERID_TWO, "com.example.app1", - 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); - - assertFalse(fsc.removeNotification(sbn_user1_app3_fg)); - assertFalse(fsc.removeNotification(sbn_user2_app2_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app1_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); - - fsc.addNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); - fsc.addNotification(sbn_user2_app2_fg, NotificationManager.IMPORTANCE_DEFAULT); - fsc.addNotification(sbn_user1_app3_fg, NotificationManager.IMPORTANCE_DEFAULT); - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); - fsc.addNotification(sbn_user2_app1, NotificationManager.IMPORTANCE_DEFAULT); - - // these are never added to the tracker - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); - - fsc.updateNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); - fsc.updateNotification(sbn_user2_app1, NotificationManager.IMPORTANCE_DEFAULT); - // should still not be there - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); - - fsc.updateNotification(sbn_user2_app2_fg, NotificationManager.IMPORTANCE_DEFAULT); - fsc.updateNotification(sbn_user1_app3_fg, NotificationManager.IMPORTANCE_DEFAULT); - fsc.updateNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); - - assertTrue(fsc.removeNotification(sbn_user1_app3_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app3_fg)); - - assertTrue(fsc.removeNotification(sbn_user2_app2_fg)); - assertFalse(fsc.removeNotification(sbn_user2_app2_fg)); - - assertTrue(fsc.removeNotification(sbn_user1_app1_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app1_fg)); - - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); - } - - @Test - public void testNotificationCRUD_stdLayout() { - StatusBarNotification sbn_user1_app1_fg = - makeMockFgSBN(USERID_ONE, "com.example.app1", 0, true); - StatusBarNotification sbn_user2_app2_fg = - makeMockFgSBN(USERID_TWO, "com.example.app2", 1, true); - StatusBarNotification sbn_user1_app3_fg = - makeMockFgSBN(USERID_ONE, "com.example.app3", 2, true); - StatusBarNotification sbn_user1_app1 = makeMockSBN(USERID_ONE, "com.example.app1", - 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); - StatusBarNotification sbn_user2_app1 = makeMockSBN(USERID_TWO, "com.example.app1", - 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); - - assertFalse(fsc.removeNotification(sbn_user1_app3_fg)); - assertFalse(fsc.removeNotification(sbn_user2_app2_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app1_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); - - fsc.addNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); - fsc.addNotification(sbn_user2_app2_fg, NotificationManager.IMPORTANCE_MIN); - fsc.addNotification(sbn_user1_app3_fg, NotificationManager.IMPORTANCE_MIN); - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); - fsc.addNotification(sbn_user2_app1, NotificationManager.IMPORTANCE_MIN); - - // these are never added to the tracker - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); - - fsc.updateNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); - fsc.updateNotification(sbn_user2_app1, NotificationManager.IMPORTANCE_MIN); - // should still not be there - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); - - fsc.updateNotification(sbn_user2_app2_fg, NotificationManager.IMPORTANCE_MIN); - fsc.updateNotification(sbn_user1_app3_fg, NotificationManager.IMPORTANCE_MIN); - fsc.updateNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); - - assertTrue(fsc.removeNotification(sbn_user1_app3_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app3_fg)); - - assertTrue(fsc.removeNotification(sbn_user2_app2_fg)); - assertFalse(fsc.removeNotification(sbn_user2_app2_fg)); - - assertTrue(fsc.removeNotification(sbn_user1_app1_fg)); - assertFalse(fsc.removeNotification(sbn_user1_app1_fg)); - - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.removeNotification(sbn_user2_app1)); + mFsc = new ForegroundServiceController(); + NotificationEntryManager notificationEntryManager = mock(NotificationEntryManager.class); + mListener = new ForegroundServiceNotificationListener( + mContext, mFsc, notificationEntryManager); + ArgumentCaptor<NotificationEntryListener> entryListenerCaptor = + ArgumentCaptor.forClass(NotificationEntryListener.class); + verify(notificationEntryManager).addNotificationEntryListener( + entryListenerCaptor.capture()); + mEntryListener = entryListenerCaptor.getValue(); } @Test public void testAppOpsCRUD() { // no crash on remove that doesn't exist - fsc.onAppOpChanged(9, 1000, "pkg1", false); - assertNull(fsc.getAppOps(0, "pkg1")); + mFsc.onAppOpChanged(9, 1000, "pkg1", false); + assertNull(mFsc.getAppOps(0, "pkg1")); // multiuser & multipackage - fsc.onAppOpChanged(8, 50, "pkg1", true); - fsc.onAppOpChanged(1, 60, "pkg3", true); - fsc.onAppOpChanged(7, 500000, "pkg2", true); + mFsc.onAppOpChanged(8, 50, "pkg1", true); + mFsc.onAppOpChanged(1, 60, "pkg3", true); + mFsc.onAppOpChanged(7, 500000, "pkg2", true); - assertEquals(1, fsc.getAppOps(0, "pkg1").size()); - assertTrue(fsc.getAppOps(0, "pkg1").contains(8)); + assertEquals(1, mFsc.getAppOps(0, "pkg1").size()); + assertTrue(mFsc.getAppOps(0, "pkg1").contains(8)); - assertEquals(1, fsc.getAppOps(UserHandle.getUserId(500000), "pkg2").size()); - assertTrue(fsc.getAppOps(UserHandle.getUserId(500000), "pkg2").contains(7)); + assertEquals(1, mFsc.getAppOps(UserHandle.getUserId(500000), "pkg2").size()); + assertTrue(mFsc.getAppOps(UserHandle.getUserId(500000), "pkg2").contains(7)); - assertEquals(1, fsc.getAppOps(0, "pkg3").size()); - assertTrue(fsc.getAppOps(0, "pkg3").contains(1)); + assertEquals(1, mFsc.getAppOps(0, "pkg3").size()); + assertTrue(mFsc.getAppOps(0, "pkg3").contains(1)); // multiple ops for the same package - fsc.onAppOpChanged(9, 50, "pkg1", true); - fsc.onAppOpChanged(5, 50, "pkg1", true); + mFsc.onAppOpChanged(9, 50, "pkg1", true); + mFsc.onAppOpChanged(5, 50, "pkg1", true); - assertEquals(3, fsc.getAppOps(0, "pkg1").size()); - assertTrue(fsc.getAppOps(0, "pkg1").contains(8)); - assertTrue(fsc.getAppOps(0, "pkg1").contains(9)); - assertTrue(fsc.getAppOps(0, "pkg1").contains(5)); + assertEquals(3, mFsc.getAppOps(0, "pkg1").size()); + assertTrue(mFsc.getAppOps(0, "pkg1").contains(8)); + assertTrue(mFsc.getAppOps(0, "pkg1").contains(9)); + assertTrue(mFsc.getAppOps(0, "pkg1").contains(5)); - assertEquals(1, fsc.getAppOps(UserHandle.getUserId(500000), "pkg2").size()); - assertTrue(fsc.getAppOps(UserHandle.getUserId(500000), "pkg2").contains(7)); + assertEquals(1, mFsc.getAppOps(UserHandle.getUserId(500000), "pkg2").size()); + assertTrue(mFsc.getAppOps(UserHandle.getUserId(500000), "pkg2").contains(7)); // remove one of the multiples - fsc.onAppOpChanged(9, 50, "pkg1", false); - assertEquals(2, fsc.getAppOps(0, "pkg1").size()); - assertTrue(fsc.getAppOps(0, "pkg1").contains(8)); - assertTrue(fsc.getAppOps(0, "pkg1").contains(5)); + mFsc.onAppOpChanged(9, 50, "pkg1", false); + assertEquals(2, mFsc.getAppOps(0, "pkg1").size()); + assertTrue(mFsc.getAppOps(0, "pkg1").contains(8)); + assertTrue(mFsc.getAppOps(0, "pkg1").contains(5)); // remove last op - fsc.onAppOpChanged(1, 60, "pkg3", false); - assertNull(fsc.getAppOps(0, "pkg3")); + mFsc.onAppOpChanged(1, 60, "pkg3", false); + assertNull(mFsc.getAppOps(0, "pkg3")); } @Test - public void testDungeonPredicate() { + public void testDisclosurePredicate() { StatusBarNotification sbn_user1_app1 = makeMockSBN(USERID_ONE, "com.example.app1", 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); - StatusBarNotification sbn_user1_dungeon = makeMockSBN(USERID_ONE, "android", + StatusBarNotification sbn_user1_disclosure = makeMockSBN(USERID_ONE, "android", SystemMessageProto.SystemMessage.NOTE_FOREGROUND_SERVICES, null, Notification.FLAG_NO_CLEAR); - assertTrue(fsc.isDungeonNotification(sbn_user1_dungeon)); - assertFalse(fsc.isDungeonNotification(sbn_user1_app1)); + assertTrue(mFsc.isDisclosureNotification(sbn_user1_disclosure)); + assertFalse(mFsc.isDisclosureNotification(sbn_user1_app1)); } @Test - public void testDungeonCRUD() { - StatusBarNotification sbn_user1_app1 = makeMockSBN(USERID_ONE, "com.example.app1", - 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); - StatusBarNotification sbn_user1_dungeon = makeMockSBN(USERID_ONE, "android", - SystemMessageProto.SystemMessage.NOTE_FOREGROUND_SERVICES, - null, Notification.FLAG_NO_CLEAR); - - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); - fsc.addNotification(sbn_user1_dungeon, NotificationManager.IMPORTANCE_DEFAULT); - - fsc.removeNotification(sbn_user1_dungeon); - assertFalse(fsc.removeNotification(sbn_user1_app1)); - } - - @Test - public void testNeedsDungeonAfterRemovingUnrelatedNotification() { + public void testNeedsDisclosureAfterRemovingUnrelatedNotification() { final String PKG1 = "com.example.app100"; StatusBarNotification sbn_user1_app1 = makeMockSBN(USERID_ONE, PKG1, @@ -233,21 +132,21 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { StatusBarNotification sbn_user1_app1_fg = makeMockFgSBN(USERID_ONE, PKG1); // first add a normal notification - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); + entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); // nothing required yet - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); // now the app starts a fg service - fsc.addNotification(makeMockDungeon(USERID_ONE, new String[]{ PKG1 }), + entryAdded(makeMockDisclosure(USERID_ONE, new String[]{PKG1}), NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); // should be required! + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); // should be required! // add the fg notification - fsc.addNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); // app1 has got it covered + entryAdded(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); // app1 has got it covered // remove the boring notification - fsc.removeNotification(sbn_user1_app1); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); // app1 has STILL got it covered - assertTrue(fsc.removeNotification(sbn_user1_app1_fg)); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); // should be required! + entryRemoved(sbn_user1_app1); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); // app1 has STILL got it covered + entryRemoved(sbn_user1_app1_fg); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); // should be required! } @Test @@ -257,115 +156,117 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { StatusBarNotification sbn_user1_app1 = makeMockSBN(USERID_ONE, PKG1, 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); + entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); // no services are "running" - fsc.addNotification(makeMockDungeon(USERID_ONE, null), + entryAdded(makeMockDisclosure(USERID_ONE, null), NotificationManager.IMPORTANCE_DEFAULT); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); - fsc.updateNotification(makeMockDungeon(USERID_ONE, new String[]{PKG1}), + entryUpdated(makeMockDisclosure(USERID_ONE, new String[]{PKG1}), NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); // should be required! - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); // should be required! + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); // switch to different package - fsc.updateNotification(makeMockDungeon(USERID_ONE, new String[]{PKG2}), + entryUpdated(makeMockDisclosure(USERID_ONE, new String[]{PKG2}), NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); - fsc.updateNotification(makeMockDungeon(USERID_TWO, new String[]{PKG1}), + entryUpdated(makeMockDisclosure(USERID_TWO, new String[]{PKG1}), NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); - assertTrue(fsc.isDungeonNeededForUser(USERID_TWO)); // finally user2 needs one too + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_TWO)); // finally user2 needs one too - fsc.updateNotification(makeMockDungeon(USERID_ONE, new String[]{PKG2, PKG1}), + entryUpdated(makeMockDisclosure(USERID_ONE, new String[]{PKG2, PKG1}), NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); - assertTrue(fsc.isDungeonNeededForUser(USERID_TWO)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_TWO)); - fsc.removeNotification(makeMockDungeon(USERID_ONE, null /*unused*/)); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); - assertTrue(fsc.isDungeonNeededForUser(USERID_TWO)); + entryRemoved(makeMockDisclosure(USERID_ONE, null /*unused*/)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_TWO)); - fsc.removeNotification(makeMockDungeon(USERID_TWO, null /*unused*/)); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + entryRemoved(makeMockDisclosure(USERID_TWO, null /*unused*/)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); } @Test - public void testDungeonBasic() { + public void testDisclosureBasic() { final String PKG1 = "com.example.app0"; StatusBarNotification sbn_user1_app1 = makeMockSBN(USERID_ONE, PKG1, 5000, "monkeys", Notification.FLAG_AUTO_CANCEL); StatusBarNotification sbn_user1_app1_fg = makeMockFgSBN(USERID_ONE, PKG1); - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); // not fg - fsc.addNotification(makeMockDungeon(USERID_ONE, new String[]{ PKG1 }), + entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); // not fg + entryAdded(makeMockDisclosure(USERID_ONE, new String[]{PKG1}), NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); // should be required! - fsc.addNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); // app1 has got it covered - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); // should be required! + entryAdded(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); // app1 has got it covered + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); // let's take out the other notification and see what happens. - fsc.removeNotification(sbn_user1_app1); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); // still covered by sbn_user1_app1_fg - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + entryRemoved(sbn_user1_app1); + assertFalse( + mFsc.isDisclosureNeededForUser(USERID_ONE)); // still covered by sbn_user1_app1_fg + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); // let's attempt to downgrade the notification from FLAG_FOREGROUND and see what we get StatusBarNotification sbn_user1_app1_fg_sneaky = makeMockFgSBN(USERID_ONE, PKG1); sbn_user1_app1_fg_sneaky.getNotification().flags = 0; - fsc.updateNotification(sbn_user1_app1_fg_sneaky, NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); // should be required! - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + entryUpdated(sbn_user1_app1_fg_sneaky, + NotificationManager.IMPORTANCE_DEFAULT); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); // should be required! + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); // ok, ok, we'll put it back sbn_user1_app1_fg_sneaky.getNotification().flags = Notification.FLAG_FOREGROUND_SERVICE; - fsc.updateNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + entryUpdated(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); - assertTrue(fsc.removeNotification(sbn_user1_app1_fg_sneaky)); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); // should be required! - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + entryRemoved(sbn_user1_app1_fg_sneaky); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); // should be required! + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); // now let's test an upgrade - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); sbn_user1_app1.getNotification().flags |= Notification.FLAG_FOREGROUND_SERVICE; - fsc.updateNotification(sbn_user1_app1, + entryUpdated(sbn_user1_app1, NotificationManager.IMPORTANCE_DEFAULT); // this is now a fg notification - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); // remove it, make sure we're out of compliance again - assertTrue(fsc.removeNotification(sbn_user1_app1)); // was fg, should return true - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); + entryRemoved(sbn_user1_app1); // was fg, should return true + entryRemoved(sbn_user1_app1); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); // importance upgrade - fsc.addNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); - assertTrue(fsc.isDungeonNeededForUser(USERID_ONE)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + entryAdded(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); + assertTrue(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); sbn_user1_app1.getNotification().flags |= Notification.FLAG_FOREGROUND_SERVICE; - fsc.updateNotification(sbn_user1_app1_fg, + entryUpdated(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_DEFAULT); // this is now a fg notification // finally, let's turn off the service - fsc.addNotification(makeMockDungeon(USERID_ONE, null), + entryAdded(makeMockDisclosure(USERID_ONE, null), NotificationManager.IMPORTANCE_DEFAULT); - assertFalse(fsc.isDungeonNeededForUser(USERID_ONE)); - assertFalse(fsc.isDungeonNeededForUser(USERID_TWO)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_ONE)); + assertFalse(mFsc.isDisclosureNeededForUser(USERID_TWO)); } @Test @@ -375,8 +276,8 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { StatusBarNotification sbn_user1_overlay = makeMockSBN(USERID_ONE, "android", 0, "AlertWindowNotification", Notification.FLAG_NO_CLEAR); - assertTrue(fsc.isSystemAlertNotification(sbn_user1_overlay)); - assertFalse(fsc.isSystemAlertNotification(sbn_user1_app1)); + assertTrue(mFsc.isSystemAlertNotification(sbn_user1_overlay)); + assertFalse(mFsc.isSystemAlertNotification(sbn_user1_app1)); } @Test @@ -386,54 +287,54 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { StatusBarNotification sbn_user1_app1 = makeMockFgSBN(USERID_ONE, PKG1, 0, true); sbn_user1_app1.getNotification().flags = 0; StatusBarNotification sbn_user1_app1_fg = makeMockFgSBN(USERID_ONE, PKG1, 1, true); - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); // not fg - assertTrue(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - fsc.addNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // app1 has got it covered - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, "otherpkg")); + entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); // not fg + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! + entryAdded(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // app1 has got it covered + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "otherpkg")); // let's take out the non-fg notification and see what happens. - fsc.removeNotification(sbn_user1_app1); + entryRemoved(sbn_user1_app1); // still covered by sbn_user1_app1_fg - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, "anyPkg")); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "anyPkg")); // let's attempt to downgrade the notification from FLAG_FOREGROUND and see what we get StatusBarNotification sbn_user1_app1_fg_sneaky = makeMockFgSBN(USERID_ONE, PKG1, 1, true); sbn_user1_app1_fg_sneaky.getNotification().flags = 0; - fsc.updateNotification(sbn_user1_app1_fg_sneaky, NotificationManager.IMPORTANCE_MIN); - assertTrue(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, "anything")); + entryUpdated(sbn_user1_app1_fg_sneaky, NotificationManager.IMPORTANCE_MIN); + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "anything")); // ok, ok, we'll put it back sbn_user1_app1_fg_sneaky.getNotification().flags = Notification.FLAG_FOREGROUND_SERVICE; - fsc.updateNotification(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, "whatever")); + entryUpdated(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "whatever")); - assertTrue(fsc.removeNotification(sbn_user1_app1_fg_sneaky)); - assertTrue(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, "a")); + entryRemoved(sbn_user1_app1_fg_sneaky); + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "a")); // let's try a custom layout sbn_user1_app1_fg_sneaky = makeMockFgSBN(USERID_ONE, PKG1, 1, false); - fsc.updateNotification(sbn_user1_app1_fg_sneaky, NotificationManager.IMPORTANCE_MIN); - assertTrue(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, "anything")); + entryUpdated(sbn_user1_app1_fg_sneaky, NotificationManager.IMPORTANCE_MIN); + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "anything")); // now let's test an upgrade (non fg to fg) - fsc.addNotification(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); - assertTrue(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, "b")); + entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "b")); sbn_user1_app1.getNotification().flags |= Notification.FLAG_FOREGROUND_SERVICE; - fsc.updateNotification(sbn_user1_app1, + entryUpdated(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); // this is now a fg notification - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, PKG1)); - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, PKG1)); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // remove it, make sure we're out of compliance again - assertTrue(fsc.removeNotification(sbn_user1_app1)); // was fg, should return true - assertFalse(fsc.removeNotification(sbn_user1_app1)); - assertFalse(fsc.isSystemAlertWarningNeeded(USERID_TWO, PKG1)); - assertTrue(fsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); + entryRemoved(sbn_user1_app1); // was fg, should return true + entryRemoved(sbn_user1_app1); + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, PKG1)); + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); } private StatusBarNotification makeMockSBN(int userid, String pkg, int id, String tag, @@ -475,7 +376,7 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { return makeMockSBN(userid, pkg, 1000, "foo", Notification.FLAG_FOREGROUND_SERVICE); } - private StatusBarNotification makeMockDungeon(int userid, String[] pkgs) { + private StatusBarNotification makeMockDisclosure(int userid, String[] pkgs) { final Notification n = mock(Notification.class); n.flags = Notification.FLAG_ONGOING_EVENT; final Bundle extras = new Bundle(); @@ -488,4 +389,21 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { sbn.getNotification().extras = extras; return sbn; } + + private void entryRemoved(StatusBarNotification notification) { + mEntryListener.onEntryRemoved(new NotificationData.Entry(notification), + null, false); + } + + private void entryAdded(StatusBarNotification notification, int importance) { + NotificationData.Entry entry = new NotificationData.Entry(notification); + entry.importance = importance; + mEntryListener.onPendingEntryAdded(entry); + } + + private void entryUpdated(StatusBarNotification notification, int importance) { + NotificationData.Entry entry = new NotificationData.Entry(notification); + entry.importance = importance; + mEntryListener.onEntryUpdated(entry); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java index 122b094558ea..e91a7e9bfcb6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java @@ -134,9 +134,12 @@ public class ScreenDecorationsTest extends SysuiTestCase { public void testNoRounding_NoCutout() { mContext.getOrCreateTestableResources().addOverride( com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 0); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius_top, 0); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius_bottom, 0); + 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); @@ -153,7 +156,8 @@ public class ScreenDecorationsTest extends SysuiTestCase { public void testRounding() { mContext.getOrCreateTestableResources().addOverride( com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 20); + mContext.getOrCreateTestableResources().addOverride( + com.android.internal.R.dimen.rounded_corner_radius, 20); mContext.getOrCreateTestableResources() .addOverride(dimen.rounded_corner_content_padding, 20); @@ -173,7 +177,8 @@ public class ScreenDecorationsTest extends SysuiTestCase { public void testCutout() { mContext.getOrCreateTestableResources().addOverride( com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, true); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 0); + mContext.getOrCreateTestableResources().addOverride( + com.android.internal.R.dimen.rounded_corner_radius, 0); mContext.getOrCreateTestableResources() .addOverride(dimen.rounded_corner_content_padding, 0); @@ -186,7 +191,8 @@ public class ScreenDecorationsTest extends SysuiTestCase { public void testDelayedCutout() { mContext.getOrCreateTestableResources().addOverride( com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 0); + mContext.getOrCreateTestableResources().addOverride( + com.android.internal.R.dimen.rounded_corner_radius, 0); mContext.getOrCreateTestableResources() .addOverride(dimen.rounded_corner_content_padding, 0); @@ -234,12 +240,14 @@ public class ScreenDecorationsTest extends SysuiTestCase { public void testUpdateRoundedCorners() { mContext.getOrCreateTestableResources().addOverride( com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 20); + mContext.getOrCreateTestableResources().addOverride( + com.android.internal.R.dimen.rounded_corner_radius, 20); mScreenDecorations.start(); assertEquals(mScreenDecorations.mRoundedDefault, 20); - mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 5); + mContext.getOrCreateTestableResources().addOverride( + com.android.internal.R.dimen.rounded_corner_radius, 5); mScreenDecorations.onConfigurationChanged(null); assertEquals(mScreenDecorations.mRoundedDefault, 5); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java index 8f2b2d065f72..31df4a3fc766 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java @@ -18,6 +18,10 @@ package com.android.systemui.bubbles; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.app.IActivityManager; import android.content.Context; @@ -29,6 +33,9 @@ import android.widget.FrameLayout; import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.NotificationTestHelper; +import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.NotificationEntryListener; +import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.StatusBarWindowController; @@ -36,6 +43,8 @@ import com.android.systemui.statusbar.phone.StatusBarWindowController; 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; @@ -45,6 +54,8 @@ import org.mockito.MockitoAnnotations; public class BubbleControllerTest extends SysuiTestCase { @Mock + private NotificationEntryManager mNotificationEntryManager; + @Mock private WindowManager mWindowManager; @Mock private IActivityManager mActivityManager; @@ -52,17 +63,23 @@ public class BubbleControllerTest extends SysuiTestCase { private DozeParameters mDozeParameters; @Mock private FrameLayout mStatusBarView; + @Captor + private ArgumentCaptor<NotificationEntryListener> mEntryListenerCaptor; private TestableBubbleController mBubbleController; private StatusBarWindowController mStatusBarWindowController; + private NotificationEntryListener mEntryListener; private NotificationTestHelper mNotificationTestHelper; private ExpandableNotificationRow mRow; private ExpandableNotificationRow mRow2; + private final NotificationData mNotificationData = new NotificationData(); + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); + mDependency.injectTestDependency(NotificationEntryManager.class, mNotificationEntryManager); // Bubbles get added to status bar window view mStatusBarWindowController = new StatusBarWindowController(mContext, mWindowManager, @@ -74,7 +91,15 @@ public class BubbleControllerTest extends SysuiTestCase { mRow = mNotificationTestHelper.createBubble(); mRow2 = mNotificationTestHelper.createBubble(); + // Return non-null notification data from the NEM + when(mNotificationEntryManager.getNotificationData()).thenReturn(mNotificationData); + mBubbleController = new TestableBubbleController(mContext, mStatusBarWindowController); + + // Get a reference to the BubbleController's entry listener + verify(mNotificationEntryManager, atLeastOnce()) + .addNotificationEntryListener(mEntryListenerCaptor.capture()); + mEntryListener = mEntryListenerCaptor.getValue(); } @Test @@ -102,6 +127,8 @@ public class BubbleControllerTest extends SysuiTestCase { mBubbleController.removeBubble(mRow.getEntry().key); assertFalse(mStatusBarWindowController.getBubblesShowing()); + assertTrue(mRow.getEntry().isBubbleDismissed()); + verify(mNotificationEntryManager).updateNotifications(); } @Test @@ -112,6 +139,7 @@ public class BubbleControllerTest extends SysuiTestCase { mBubbleController.dismissStack(); assertFalse(mStatusBarWindowController.getBubblesShowing()); + verify(mNotificationEntryManager, times(3)).updateNotifications(); } @Test @@ -140,6 +168,12 @@ public class BubbleControllerTest extends SysuiTestCase { assertFalse(mBubbleController.isStackExpanded()); } + @Test + public void testMarkNewNotificationAsBubble() { + mEntryListener.onPendingEntryAdded(mRow.getEntry()); + assertTrue(mRow.getEntry().isBubble()); + } + static class TestableBubbleController extends BubbleController { TestableBubbleController(Context context, diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java index 2cb326eb7269..823485f4624d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java @@ -39,6 +39,7 @@ import com.android.systemui.SystemUIFactory; import com.android.systemui.SysuiBaseFragmentTest; import com.android.systemui.qs.tileimpl.QSFactoryImpl; import com.android.systemui.shared.plugins.PluginManager; +import com.android.systemui.statusbar.phone.AutoTileManager; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.policy.Clock; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -92,7 +93,8 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { processAllMessages(); QSTileHost host = new QSTileHost(mContext, mock(StatusBarIconController.class), mock(QSFactoryImpl.class), new Handler(), Looper.myLooper(), - mock(PluginManager.class), mock(TunerService.class)); + mock(PluginManager.class), mock(TunerService.class), + () -> mock(AutoTileManager.class)); qs.setHost(host); qs.setListening(true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java index 63f4bbc73ed8..03278b4aadc6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java @@ -33,6 +33,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.qs.QSTileHost; import com.android.systemui.qs.tileimpl.QSFactoryImpl; import com.android.systemui.shared.plugins.PluginManager; +import com.android.systemui.statusbar.phone.AutoTileManager; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.policy.BluetoothController; import com.android.systemui.tuner.TunerService; @@ -65,7 +66,8 @@ public class TileServicesTest extends SysuiTestCase { new Handler(), Looper.myLooper(), mock(PluginManager.class), - mock(TunerService.class)); + mock(TunerService.class), + () -> mock(AutoTileManager.class)); mTileService = new TestTileServices(host, Looper.getMainLooper()); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java index a04e57bb4990..51d94f08000a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar; import static android.view.Display.DEFAULT_DISPLAY; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -42,10 +43,10 @@ public class CommandQueueTest extends SysuiTestCase { @Before public void setup() { - mCommandQueue = new CommandQueue(); + mCommandQueue = new CommandQueue(mContext); mCallbacks = mock(Callbacks.class); mCommandQueue.addCallback(mCallbacks); - verify(mCallbacks).disable(eq(0), eq(0), eq(false)); + verify(mCallbacks).disable(anyInt(), eq(0), eq(0), eq(false)); } @After @@ -73,7 +74,7 @@ public class CommandQueueTest extends SysuiTestCase { int state2 = 42; mCommandQueue.disable(DEFAULT_DISPLAY, state1, state2); waitForIdleSync(); - verify(mCallbacks).disable(eq(state1), eq(state2), eq(true)); + verify(mCallbacks).disable(eq(DEFAULT_DISPLAY), eq(state1), eq(state2), eq(true)); } @Test @@ -104,7 +105,8 @@ public class CommandQueueTest extends SysuiTestCase { Rect r = new Rect(); mCommandQueue.setSystemUiVisibility(DEFAULT_DISPLAY, 1, 2, 3, 4, null, r); waitForIdleSync(); - verify(mCallbacks).setSystemUiVisibility(eq(1), eq(2), eq(3), eq(4), eq(null), eq(r)); + verify(mCallbacks).setSystemUiVisibility(eq(DEFAULT_DISPLAY), eq(1), eq(2), eq(3), eq(4), + eq(null), eq(r)); } // TODO(b/117478341): add test case for multi-display @@ -112,7 +114,7 @@ public class CommandQueueTest extends SysuiTestCase { public void testTopAppWindowChanged() { mCommandQueue.topAppWindowChanged(DEFAULT_DISPLAY, true); waitForIdleSync(); - verify(mCallbacks).topAppWindowChanged(eq(true)); + verify(mCallbacks).topAppWindowChanged(eq(DEFAULT_DISPLAY), eq(true)); } // TODO(b/117478341): add test case for multi-display @@ -120,7 +122,8 @@ public class CommandQueueTest extends SysuiTestCase { public void testShowImeButton() { mCommandQueue.setImeWindowStatus(DEFAULT_DISPLAY, null, 1, 2, true); waitForIdleSync(); - verify(mCallbacks).setImeWindowStatus(eq(null), eq(1), eq(2), eq(true)); + verify(mCallbacks).setImeWindowStatus( + eq(DEFAULT_DISPLAY), eq(null), eq(1), eq(2), eq(true)); } @Test @@ -177,7 +180,7 @@ public class CommandQueueTest extends SysuiTestCase { public void testSetWindowState() { mCommandQueue.setWindowState(DEFAULT_DISPLAY, 1, 2); waitForIdleSync(); - verify(mCallbacks).setWindowState(eq(1), eq(2)); + verify(mCallbacks).setWindowState(eq(DEFAULT_DISPLAY), eq(1), eq(2)); } @Test @@ -192,7 +195,7 @@ public class CommandQueueTest extends SysuiTestCase { public void testAppTransitionPending() { mCommandQueue.appTransitionPending(DEFAULT_DISPLAY); waitForIdleSync(); - verify(mCallbacks).appTransitionPending(eq(false)); + verify(mCallbacks).appTransitionPending(eq(DEFAULT_DISPLAY), eq(false)); } // TODO(b/117478341): add test case for multi-display @@ -200,7 +203,7 @@ public class CommandQueueTest extends SysuiTestCase { public void testAppTransitionCancelled() { mCommandQueue.appTransitionCancelled(DEFAULT_DISPLAY); waitForIdleSync(); - verify(mCallbacks).appTransitionCancelled(); + verify(mCallbacks).appTransitionCancelled(eq(DEFAULT_DISPLAY)); } // TODO(b/117478341): add test case for multi-display @@ -208,7 +211,8 @@ public class CommandQueueTest extends SysuiTestCase { public void testAppTransitionStarting() { mCommandQueue.appTransitionStarting(DEFAULT_DISPLAY, 1, 2); waitForIdleSync(); - verify(mCallbacks).appTransitionStarting(eq(1L), eq(2L), eq(false)); + verify(mCallbacks).appTransitionStarting( + eq(DEFAULT_DISPLAY), eq(1L), eq(2L), eq(false)); } // TODO(b/117478341): add test case for multi-display @@ -216,7 +220,7 @@ public class CommandQueueTest extends SysuiTestCase { public void testAppTransitionFinished() { mCommandQueue.appTransitionFinished(DEFAULT_DISPLAY); waitForIdleSync(); - verify(mCallbacks).appTransitionFinished(); + verify(mCallbacks).appTransitionFinished(eq(DEFAULT_DISPLAY)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java index 8cf4b05b6371..e84e0f30c745 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java @@ -77,7 +77,7 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase { @Mock private ShadeController mShadeController; private NotificationViewHierarchyManager mViewHierarchyManager; - private NotificationTestHelper mHelper = new NotificationTestHelper(mContext); + private NotificationTestHelper mHelper; @Before public void setUp() { @@ -90,6 +90,8 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase { mDependency.injectTestDependency(VisualStabilityManager.class, mVisualStabilityManager); mDependency.injectTestDependency(ShadeController.class, mShadeController); + mHelper = new NotificationTestHelper(mContext); + when(mEntryManager.getNotificationData()).thenReturn(mNotificationData); mViewHierarchyManager = new NotificationViewHierarchyManager(mContext, @@ -262,9 +264,6 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase { public void setMaxDisplayedNotifications(int maxNotifications) {} @Override - public void snapViewIfNeeded(Entry entry) {} - - @Override public ViewGroup getViewParentForNotification(NotificationData.Entry entry) { return null; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationDataTest.java index 871ff8998c20..6f4de1cc6dd8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationDataTest.java @@ -400,8 +400,7 @@ public class NotificationDataTest extends SysuiTestCase { Icon.createWithResource(getContext(), android.R.drawable.sym_def_app_icon), title, PendingIntent.getBroadcast(getContext(), 0, new Intent("Action"), 0)) - .setSemanticAction( - Notification.Action.SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION) + .setContextual(true) .build(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java index a2d408e4e97e..6197341acda5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java @@ -121,6 +121,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase { @Mock private MetricsLogger mMetricsLogger; @Mock private SmartReplyController mSmartReplyController; @Mock private RowInflaterTask mAsyncInflationTask; + @Mock private NotificationRowBinder mMockedRowBinder; private NotificationData.Entry mEntry; private StatusBarNotification mSbn; @@ -256,7 +257,6 @@ public class NotificationEntryManagerTest extends SysuiTestCase { // Check that no inflation error occurred. verify(mEntryListener, never()).onInflationError(any(), any()); - verify(mForegroundServiceController).addNotification(eq(mSbn), anyInt()); // Row inflation: ArgumentCaptor<NotificationData.Entry> entryCaptor = ArgumentCaptor.forClass( @@ -292,7 +292,6 @@ public class NotificationEntryManagerTest extends SysuiTestCase { verify(mEntryListener, never()).onInflationError(any(), any()); verify(mPresenter).updateNotificationViews(); - verify(mForegroundServiceController).updateNotification(eq(mSbn), anyInt()); verify(mEntryListener).onEntryUpdated(mEntry); assertNotNull(mEntry.getRow()); assertEquals(mEntry.userSentiment, @@ -310,11 +309,10 @@ public class NotificationEntryManagerTest extends SysuiTestCase { verify(mEntryListener, never()).onInflationError(any(), any()); - verify(mForegroundServiceController).removeNotification(mSbn); verify(mListContainer).cleanUpViewStateForEntry(mEntry); verify(mPresenter).updateNotificationViews(); - verify(mEntryListener).onEntryRemoved(mEntry, mSbn.getKey(), mSbn, - null, false /* lifetimeExtended */, false /* removedByUser */); + verify(mEntryListener).onEntryRemoved( + mEntry, null, false /* removedByUser */); verify(mRow).setRemoved(); assertNull(mEntryManager.getNotificationData().get(mSbn.getKey())); @@ -338,8 +336,31 @@ public class NotificationEntryManagerTest extends SysuiTestCase { assertNotNull(mEntryManager.getNotificationData().get(mSbn.getKey())); verify(extender).setShouldManageLifetime(mEntry, true /* shouldManage */); - verify(mEntryListener).onEntryRemoved(mEntry, mSbn.getKey(), null, - null, true /* lifetimeExtended */, false /* removedByUser */); + verify(mEntryListener, never()).onEntryRemoved( + mEntry, null, false /* removedByUser */); + } + + @Test + public void testRemoveNotification_onEntryRemoveNotFiredIfEntryDoesntExist() { + com.android.systemui.util.Assert.isNotMainThread(); + + mEntryManager.removeNotification("not_a_real_key", mRankingMap); + + verify(mEntryListener, never()).onEntryRemoved( + mEntry, null, false /* removedByUser */); + } + + @Test + public void testRemoveNotification_whilePending() throws InterruptedException { + com.android.systemui.util.Assert.isNotMainThread(); + + mEntryManager.setRowBinder(mMockedRowBinder); + + mEntryManager.addNotification(mSbn, mRankingMap); + mEntryManager.removeNotification(mSbn.getKey(), mRankingMap); + + verify(mEntryListener, never()).onEntryRemoved( + mEntry, null, false /* removedByUser */); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java index 7b96518ad13f..afdeb62a8f28 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java @@ -42,6 +42,7 @@ import com.android.systemui.UiOffloadThread; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.StatusBarStateController; import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.NotificationEntryListener; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; @@ -51,6 +52,8 @@ import com.google.android.collect.Lists; 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.Mockito; import org.mockito.MockitoAnnotations; @@ -72,9 +75,11 @@ public class NotificationLoggerTest extends SysuiTestCase { // Dependency mocks: @Mock private NotificationEntryManager mEntryManager; @Mock private NotificationListener mListener; + @Captor private ArgumentCaptor<NotificationEntryListener> mEntryListenerCaptor; private NotificationData.Entry mEntry; private TestableNotificationLogger mLogger; + private NotificationEntryListener mNotificationEntryListener; private ConcurrentLinkedQueue<AssertionError> mErrorQueue = new ConcurrentLinkedQueue<>(); @Before @@ -94,6 +99,8 @@ public class NotificationLoggerTest extends SysuiTestCase { mLogger = new TestableNotificationLogger(mListener, Dependency.get(UiOffloadThread.class), mEntryManager, mock(StatusBarStateController.class), mBarService); mLogger.setUpWithContainer(mListContainer); + verify(mEntryManager).addNotificationEntryListener(mEntryListenerCaptor.capture()); + mNotificationEntryListener = mEntryListenerCaptor.getValue(); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentViewTest.java index f0fa7887a0f9..82b42c51622d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentViewTest.java @@ -159,28 +159,37 @@ public class NotificationContentViewTest extends SysuiTestCase { verify(mockHeadsUp, times(1)).showAppOpsIcons(any()); } - private void setupAppGeneratedReplies(CharSequence[] smartReplyTitles) { - Notification.Action freeFormAction = - new Notification.Action.Builder(null, "Freeform Test Action", null).build(); - setupAppGeneratedReplies(smartReplyTitles, freeFormAction); + private void setupAppGeneratedReplies(CharSequence[] smartReplies) { + setupAppGeneratedReplies(smartReplies, true /* allowSystemGeneratedReplies */); } private void setupAppGeneratedReplies( - CharSequence[] smartReplyTitles, - Notification.Action freeFormRemoteInputAction) { + CharSequence[] smartReplies, boolean allowSystemGeneratedReplies) { PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(TEST_ACTION), 0); Notification.Action action = new Notification.Action.Builder(null, "Test Action", pendingIntent).build(); - when(mRemoteInput.getChoices()).thenReturn(smartReplyTitles); + when(mRemoteInput.getChoices()).thenReturn(smartReplies); Pair<RemoteInput, Notification.Action> remoteInputActionPair = Pair.create(mRemoteInput, action); when(mNotification.findRemoteInputActionPair(false)).thenReturn(remoteInputActionPair); + Notification.Action freeFormRemoteInputAction = + createActionBuilder("Freeform Test Action") + .setAllowGeneratedReplies(allowSystemGeneratedReplies) + .build(); Pair<RemoteInput, Notification.Action> freeFormRemoteInputActionPair = Pair.create(mFreeFormRemoteInput, freeFormRemoteInputAction); when(mNotification.findRemoteInputActionPair(true)).thenReturn( freeFormRemoteInputActionPair); + + when(mSmartReplyConstants.requiresTargetingP()).thenReturn(false); + } + + private void setupAppGeneratedSuggestions( + CharSequence[] smartReplies, List<Notification.Action> smartActions) { + setupAppGeneratedReplies(smartReplies); + when(mNotification.getContextualActions()).thenReturn(smartActions); } @Test @@ -198,7 +207,6 @@ public class NotificationContentViewTest extends SysuiTestCase { public void chooseSmartRepliesAndActions_appGeneratedSmartReplies() { CharSequence[] smartReplies = new String[] {"Reply1", "Reply2"}; setupAppGeneratedReplies(smartReplies); - when(mSmartReplyConstants.requiresTargetingP()).thenReturn(false); NotificationContentView.SmartRepliesAndActions repliesAndActions = NotificationContentView.chooseSmartRepliesAndActions(mSmartReplyConstants, mEntry); @@ -211,12 +219,9 @@ public class NotificationContentViewTest extends SysuiTestCase { @Test public void chooseSmartRepliesAndActions_appGeneratedSmartRepliesAndActions() { CharSequence[] smartReplies = new String[] {"Reply1", "Reply2"}; - setupAppGeneratedReplies(smartReplies); - when(mSmartReplyConstants.requiresTargetingP()).thenReturn(false); - List<Notification.Action> smartActions = createActions(new String[] {"Test Action 1", "Test Action 2"}); - when(mNotification.getContextualActions()).thenReturn(smartActions); + setupAppGeneratedSuggestions(smartReplies, smartActions); NotificationContentView.SmartRepliesAndActions repliesAndActions = NotificationContentView.chooseSmartRepliesAndActions(mSmartReplyConstants, mEntry); @@ -229,15 +234,11 @@ public class NotificationContentViewTest extends SysuiTestCase { @Test public void chooseSmartRepliesAndActions_sysGeneratedSmartReplies() { - Notification.Action freeFormAction = createActionBuilder("Freeform Action") - .setAllowGeneratedReplies(true) - .build(); // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart // replies. - setupAppGeneratedReplies(null, freeFormAction); + setupAppGeneratedReplies(null /* smartReplies */); - mEntry.smartReplies = - new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"}; + mEntry.smartReplies = new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"}; NotificationContentView.SmartRepliesAndActions repliesAndActions = NotificationContentView.chooseSmartRepliesAndActions(mSmartReplyConstants, mEntry); @@ -248,12 +249,9 @@ public class NotificationContentViewTest extends SysuiTestCase { @Test public void chooseSmartRepliesAndActions_noSysGeneratedSmartRepliesIfNotAllowed() { - Notification.Action freeFormAction = createActionBuilder("Freeform Action") - .setAllowGeneratedReplies(false) - .build(); // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart // replies. - setupAppGeneratedReplies(null, freeFormAction); + setupAppGeneratedReplies(null /* smartReplies */, false /* allowSystemGeneratedReplies */); mEntry.smartReplies = new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"}; @@ -268,7 +266,7 @@ public class NotificationContentViewTest extends SysuiTestCase { public void chooseSmartRepliesAndActions_sysGeneratedSmartActions() { // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart // actions. - setupAppGeneratedReplies(null); + setupAppGeneratedReplies(null /* smartReplies */); mEntry.systemGeneratedSmartActions = createActions(new String[] {"Sys Smart Action 1", "Sys Smart Action 2"}); @@ -283,18 +281,12 @@ public class NotificationContentViewTest extends SysuiTestCase { @Test public void chooseSmartRepliesAndActions_appGenPreferredOverSysGen() { - Notification.Action freeFormAction = createActionBuilder("Freeform Action") - .setAllowGeneratedReplies(true) - .build(); CharSequence[] appGenSmartReplies = new String[] {"Reply1", "Reply2"}; // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart // replies. - setupAppGeneratedReplies(appGenSmartReplies, freeFormAction); - when(mSmartReplyConstants.requiresTargetingP()).thenReturn(false); - List<Notification.Action> appGenSmartActions = createActions(new String[] {"Test Action 1", "Test Action 2"}); - when(mNotification.getContextualActions()).thenReturn(appGenSmartActions); + setupAppGeneratedSuggestions(appGenSmartReplies, appGenSmartActions); mEntry.smartReplies = new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"}; mEntry.systemGeneratedSmartActions = @@ -313,12 +305,12 @@ public class NotificationContentViewTest extends SysuiTestCase { public void chooseSmartRepliesAndActions_disallowSysGenSmartActions() { // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart // actions. - setupAppGeneratedReplies(null); - + setupAppGeneratedReplies(null /* smartReplies */, false /* allowSystemGeneratedReplies */); when(mNotification.getAllowSystemGeneratedContextualActions()).thenReturn(false); - + mEntry.smartReplies = new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"}; mEntry.systemGeneratedSmartActions = createActions(new String[] {"Sys Smart Action 1", "Sys Smart Action 2"}); + NotificationContentView.SmartRepliesAndActions repliesAndActions = NotificationContentView.chooseSmartRepliesAndActions(mSmartReplyConstants, mEntry); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java index b8c7ee093ecc..b66d0ab78fd8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java @@ -35,12 +35,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.os.Handler; -import android.os.IPowerManager; -import android.os.Looper; -import android.os.PowerManager; import android.provider.Settings; -import android.service.dreams.IDreamManager; import android.support.test.annotation.UiThreadTest; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -104,8 +99,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { @Mock private NotificationData mNotificationData; @Mock private NotificationRemoteInputManager mRemoteInputManager; @Mock private RemoteInputController mRemoteInputController; - @Mock private IDreamManager mDreamManager; - private PowerManager mPowerManager; private TestableNotificationEntryManager mEntryManager; private int mOriginalInterruptionModelSetting; @@ -122,12 +115,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { mDependency.injectMockDependency(ShadeController.class); when(mRemoteInputManager.getController()).thenReturn(mRemoteInputController); - IPowerManager powerManagerService = mock(IPowerManager.class); - mPowerManager = new PowerManager(mContext, powerManagerService, - Handler.createAsync(Looper.myLooper())); - - mEntryManager = new TestableNotificationEntryManager(mPowerManager, - mContext); + mEntryManager = new TestableNotificationEntryManager(mContext); mDependency.injectTestDependency(NotificationEntryManager.class, mEntryManager); Dependency.get(InitController.class).executePostInitTasks(); mEntryManager.setUpForTest(mock(NotificationPresenter.class), null, mHeadsUpManager, @@ -135,7 +123,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { NotificationShelf notificationShelf = mock(NotificationShelf.class); - mStackScroller = spy(new NotificationStackScrollLayout(getContext())); + mStackScroller = spy(new NotificationStackScrollLayout(getContext(), null, + true /* allowLongPress */)); mStackScroller.setShelf(notificationShelf); mStackScroller.setStatusBar(mBar); mStackScroller.setScrimController(mock(ScrimController.class)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java index 1481aef6c2f4..c0f7f0ce217f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.phone; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -30,6 +31,8 @@ import com.android.internal.app.ColorDisplayController; import com.android.systemui.SysuiTestCase; import com.android.systemui.qs.AutoAddTracker; import com.android.systemui.qs.QSTileHost; +import com.android.systemui.statusbar.policy.DataSaverController; +import com.android.systemui.statusbar.policy.HotspotController; import org.junit.Before; import org.junit.Test; @@ -51,7 +54,11 @@ public class AutoTileManagerTest extends SysuiTestCase { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); mAutoTileManager = new AutoTileManager(mContext, mAutoAddTracker, mQsTileHost, - Handler.createAsync(TestableLooper.get(this).getLooper())); + Handler.createAsync(TestableLooper.get(this).getLooper()), + mock(HotspotController.class), + mock(DataSaverController.class), + mock(ManagedProfileController.class), + mock(ColorDisplayController.class)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java index d99e46d6de12..add8838362be 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java @@ -14,6 +14,8 @@ package com.android.systemui.statusbar.phone; +import static android.view.Display.DEFAULT_DISPLAY; + import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeast; @@ -74,7 +76,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { CollapsedStatusBarFragment fragment = (CollapsedStatusBarFragment) mFragment; fragment.initNotificationIconArea(mMockNotificiationAreaController); - fragment.disable(0, 0, false); + fragment.disable(DEFAULT_DISPLAY, 0, 0, false); assertEquals(View.VISIBLE, mFragment.getView().findViewById(R.id.system_icon_area) .getVisibility()); @@ -89,12 +91,12 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { CollapsedStatusBarFragment fragment = (CollapsedStatusBarFragment) mFragment; fragment.initNotificationIconArea(mMockNotificiationAreaController); - fragment.disable(StatusBarManager.DISABLE_SYSTEM_INFO, 0, false); + fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_SYSTEM_INFO, 0, false); assertEquals(View.INVISIBLE, mFragment.getView().findViewById(R.id.system_icon_area) .getVisibility()); - fragment.disable(0, 0, false); + fragment.disable(DEFAULT_DISPLAY, 0, 0, false); assertEquals(View.VISIBLE, mFragment.getView().findViewById(R.id.system_icon_area) .getVisibility()); @@ -107,11 +109,11 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { CollapsedStatusBarFragment fragment = (CollapsedStatusBarFragment) mFragment; fragment.initNotificationIconArea(mMockNotificiationAreaController); - fragment.disable(StatusBarManager.DISABLE_NOTIFICATION_ICONS, 0, false); + fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NOTIFICATION_ICONS, 0, false); Mockito.verify(mNotificationAreaInner).setVisibility(eq(View.INVISIBLE)); - fragment.disable(0, 0, false); + fragment.disable(DEFAULT_DISPLAY, 0, 0, false); Mockito.verify(mNotificationAreaInner, atLeast(1)).setVisibility(eq(View.VISIBLE)); } @@ -123,11 +125,11 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { CollapsedStatusBarFragment fragment = (CollapsedStatusBarFragment) mFragment; fragment.initNotificationIconArea(mMockNotificiationAreaController); - fragment.disable(StatusBarManager.DISABLE_CLOCK, 0, false); + fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_CLOCK, 0, false); assertEquals(View.GONE, mFragment.getView().findViewById(R.id.clock).getVisibility()); - fragment.disable(0, 0, false); + fragment.disable(DEFAULT_DISPLAY, 0, 0, false); assertEquals(View.VISIBLE, mFragment.getView().findViewById(R.id.clock).getVisibility()); } @@ -139,7 +141,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { CollapsedStatusBarFragment fragment = (CollapsedStatusBarFragment) mFragment; fragment.initNotificationIconArea(mMockNotificiationAreaController); - fragment.disable(StatusBarManager.DISABLE_NOTIFICATION_ICONS, 0, false); + fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NOTIFICATION_ICONS, 0, false); Mockito.verify(mNotificationAreaInner).setVisibility(eq(View.INVISIBLE)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelperTest.java index 56af40054316..79695fd6d38d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelperTest.java @@ -237,8 +237,7 @@ public class NotificationGroupAlertTransferHelperTest extends SysuiTestCase { mGroupManager.onEntryAdded(summaryEntry); mGroupManager.onEntryAdded(childEntry); - mNotificationEntryListener.onEntryRemoved(childEntry, childEntry.key, null, null, - false, false); + mNotificationEntryListener.onEntryRemoved(childEntry, null, false); assertFalse(mGroupAlertTransferHelper.isAlertTransferPending(childEntry)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java index 4fabe7f8cfbb..2bbfd7d8bb8d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java @@ -14,6 +14,8 @@ package com.android.systemui.statusbar.phone; +import static android.view.Display.DEFAULT_DISPLAY; + import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -61,7 +63,7 @@ public class StatusBarNotificationPresenterTest extends SysuiTestCase { public void setup() { mMetricsLogger = new FakeMetricsLogger(); mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger); - mCommandQueue = new CommandQueue(); + mCommandQueue = new CommandQueue(mContext); mContext.putComponent(CommandQueue.class, mCommandQueue); mDependency.injectTestDependency(ShadeController.class, mShadeController); @@ -81,7 +83,8 @@ public class StatusBarNotificationPresenterTest extends SysuiTestCase { StatusBarNotification sbn = new StatusBarNotification("a", "a", 0, "a", 0, 0, n, UserHandle.of(0), null, 0); NotificationData.Entry entry = new NotificationData.Entry(sbn); - mCommandQueue.disable(StatusBarManager.DISABLE_EXPAND, 0, false /* animate */); + mCommandQueue.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_EXPAND, 0, + false /* animate */); TestableLooper.get(this).processAllMessages(); assertFalse("The panel shouldn't allow heads up while disabled", @@ -94,7 +97,8 @@ public class StatusBarNotificationPresenterTest extends SysuiTestCase { StatusBarNotification sbn = new StatusBarNotification("a", "a", 0, "a", 0, 0, n, UserHandle.of(0), null, 0); NotificationData.Entry entry = new NotificationData.Entry(sbn); - mCommandQueue.disable(0, StatusBarManager.DISABLE2_NOTIFICATION_SHADE, false /* animate */); + mCommandQueue.disable(DEFAULT_DISPLAY, 0, StatusBarManager.DISABLE2_NOTIFICATION_SHADE, + false /* animate */); TestableLooper.get(this).processAllMessages(); assertFalse("The panel shouldn't allow heads up while notitifcation shade disabled", 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 18ead907ae8e..a45a5c4c3a0e 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 @@ -18,6 +18,7 @@ package com.android.systemui.statusbar.phone; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; +import static android.view.Display.DEFAULT_DISPLAY; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; @@ -204,7 +205,7 @@ public class StatusBarTest extends SysuiTestCase { mMetricsLogger = new FakeMetricsLogger(); mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger); - mEntryManager = new TestableNotificationEntryManager(mPowerManager, mContext); + mEntryManager = new TestableNotificationEntryManager(mContext); mNotificationLogger = new NotificationLogger(mNotificationListener, Dependency.get(UiOffloadThread.class), mEntryManager, mStatusBarStateController); mDependency.injectTestDependency(NotificationLogger.class, mNotificationLogger); @@ -247,7 +248,8 @@ public class StatusBarTest extends SysuiTestCase { mock(StatusBarWindowController.class), mock(NotificationIconAreaController.class), mDozeScrimController, mock(NotificationShelf.class), mLockscreenUserManager, mCommandQueue, mNotificationPresenter, - mock(BubbleController.class), mock(NavigationBarController.class)); + mock(BubbleController.class), mock(NavigationBarController.class), + mock(AutoHideController.class)); mStatusBar.mContext = mContext; mStatusBar.mComponents = mContext.getComponents(); SystemUIFactory.getInstance().getRootComponent() @@ -546,7 +548,7 @@ public class StatusBarTest extends SysuiTestCase { when(mDeviceProvisionedController.isDeviceProvisioned()).thenReturn(true); when(mCommandQueue.panelsEnabled()).thenReturn(false); - mStatusBar.disable(StatusBarManager.DISABLE_NONE, + mStatusBar.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NONE, StatusBarManager.DISABLE2_NOTIFICATION_SHADE, false); verify(mNotificationPanelView).setQsExpansionEnabled(false); mStatusBar.animateExpandNotificationsPanel(); @@ -555,7 +557,8 @@ public class StatusBarTest extends SysuiTestCase { verify(mNotificationPanelView, never()).expand(anyBoolean()); when(mCommandQueue.panelsEnabled()).thenReturn(true); - mStatusBar.disable(StatusBarManager.DISABLE_NONE, StatusBarManager.DISABLE2_NONE, false); + mStatusBar.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NONE, + StatusBarManager.DISABLE2_NONE, false); verify(mNotificationPanelView).setQsExpansionEnabled(true); mStatusBar.animateExpandNotificationsPanel(); verify(mNotificationPanelView).expandWithoutQs(); @@ -698,7 +701,8 @@ public class StatusBarTest extends SysuiTestCase { CommandQueue commandQueue, NotificationPresenter notificationPresenter, BubbleController bubbleController, - NavigationBarController navBarController) { + NavigationBarController navBarController, + AutoHideController autoHideController) { mStatusBarKeyguardViewManager = man; mUnlockMethodCache = unlock; mKeyguardIndicationController = key; @@ -730,6 +734,7 @@ public class StatusBarTest extends SysuiTestCase { mGestureWakeLock = mock(PowerManager.WakeLock.class); mBubbleController = bubbleController; mNavigationBarController = navBarController; + mAutoHideController = autoHideController; } private WakefulnessLifecycle createAwakeWakefulnessLifecycle() { @@ -756,9 +761,8 @@ public class StatusBarTest extends SysuiTestCase { public static class TestableNotificationEntryManager extends NotificationEntryManager { - public TestableNotificationEntryManager(PowerManager powerManager, Context context) { + public TestableNotificationEntryManager(Context context) { super(context); - mPowerManager = powerManager; } public void setUpForTest(NotificationPresenter presenter, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisablerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisablerTest.java index e3a41bead26c..8b8e3f195d40 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisablerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisablerTest.java @@ -14,11 +14,11 @@ package com.android.systemui.statusbar.policy; -import static com.google.common.truth.Truth.assertThat; - import static junit.framework.TestCase.assertTrue; + import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -59,7 +59,7 @@ public class RemoteInputQuickSettingsDisablerTest extends SysuiTestCase { mRemoteInputQuickSettingsDisabler.setRemoteInputActive(Boolean.TRUE); mRemoteInputQuickSettingsDisabler.setRemoteInputActive(Boolean.FALSE); assertFalse(mRemoteInputQuickSettingsDisabler.mRemoteInputActive); - verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyBoolean()); + verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyInt(), anyBoolean()); } @Test @@ -67,7 +67,7 @@ public class RemoteInputQuickSettingsDisablerTest extends SysuiTestCase { mRemoteInputQuickSettingsDisabler.setRemoteInputActive(Boolean.FALSE); mRemoteInputQuickSettingsDisabler.setRemoteInputActive(Boolean.TRUE); assertTrue(mRemoteInputQuickSettingsDisabler.mRemoteInputActive); - verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyBoolean()); + verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyInt(), anyBoolean()); } @Test @@ -78,7 +78,7 @@ public class RemoteInputQuickSettingsDisablerTest extends SysuiTestCase { c.orientation = Configuration.ORIENTATION_LANDSCAPE; mRemoteInputQuickSettingsDisabler.onConfigChanged(c); assertTrue(mRemoteInputQuickSettingsDisabler.misLandscape); - verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyBoolean()); + verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyInt(), anyBoolean()); } @Test @@ -89,7 +89,7 @@ public class RemoteInputQuickSettingsDisablerTest extends SysuiTestCase { c.orientation = Configuration.ORIENTATION_PORTRAIT; mRemoteInputQuickSettingsDisabler.onConfigChanged(c); assertFalse(mRemoteInputQuickSettingsDisabler.misLandscape); - verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyBoolean()); + verify(mCommandQueue, atLeastOnce()).recomputeDisableFlags(anyInt(), anyBoolean()); } } diff --git a/packages/overlays/AccentColorBlackOverlay/res/values/strings.xml b/packages/overlays/AccentColorBlackOverlay/res/values/strings.xml index baf09b11ac07..da1036159d34 100644 --- a/packages/overlays/AccentColorBlackOverlay/res/values/strings.xml +++ b/packages/overlays/AccentColorBlackOverlay/res/values/strings.xml @@ -18,6 +18,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Black accent color name application label. [CHAR LIMIT=50] --> - <string name="accent_color_black_overlay" translatable="false">Black Accent Color</string> + <string name="accent_color_black_overlay" translatable="false">Black</string> </resources> diff --git a/packages/overlays/AccentColorGreenOverlay/res/values/strings.xml b/packages/overlays/AccentColorGreenOverlay/res/values/strings.xml index 4de344cbb65e..623a1dafb48d 100644 --- a/packages/overlays/AccentColorGreenOverlay/res/values/strings.xml +++ b/packages/overlays/AccentColorGreenOverlay/res/values/strings.xml @@ -18,6 +18,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Green accent color name application label. [CHAR LIMIT=50] --> - <string name="accent_color_green_overlay" translatable="false">Green Accent Color</string> + <string name="accent_color_green_overlay" translatable="false">Green</string> </resources> diff --git a/packages/overlays/AccentColorPurpleOverlay/res/values/strings.xml b/packages/overlays/AccentColorPurpleOverlay/res/values/strings.xml index d1eb95a940ac..d1c71688979e 100644 --- a/packages/overlays/AccentColorPurpleOverlay/res/values/strings.xml +++ b/packages/overlays/AccentColorPurpleOverlay/res/values/strings.xml @@ -18,6 +18,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Purple accent color name application label. [CHAR LIMIT=50] --> - <string name="accent_color_purple_overlay" translatable="false">Purple Accent Color</string> + <string name="accent_color_purple_overlay" translatable="false">Purple</string> </resources> diff --git a/packages/overlays/IconShapeRoundedRectOverlay/res/values/strings.xml b/packages/overlays/IconShapeRoundedRectOverlay/res/values/strings.xml index dc5c196c97aa..3c4c24db53ba 100644 --- a/packages/overlays/IconShapeRoundedRectOverlay/res/values/strings.xml +++ b/packages/overlays/IconShapeRoundedRectOverlay/res/values/strings.xml @@ -18,6 +18,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Rounded corner rectangle overlay --> - <string name="icon_shape_roundedrect_overlay" translatable="false">RoundedRectangle Icons</string> + <string name="icon_shape_roundedrect_overlay" translatable="false">Rounded Rectangle</string> </resources> diff --git a/packages/overlays/IconShapeSquareOverlay/res/values/strings.xml b/packages/overlays/IconShapeSquareOverlay/res/values/strings.xml index 4fd39ff26bae..577216582608 100644 --- a/packages/overlays/IconShapeSquareOverlay/res/values/strings.xml +++ b/packages/overlays/IconShapeSquareOverlay/res/values/strings.xml @@ -18,6 +18,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Square icon overlay --> - <string name="icon_shape_square_overlay" translatable="false">Square Icons</string> + <string name="icon_shape_square_overlay" translatable="false">Square</string> </resources> diff --git a/packages/overlays/IconShapeSquircleOverlay/res/values/strings.xml b/packages/overlays/IconShapeSquircleOverlay/res/values/strings.xml index b7c001c68a30..028eccb8c5a3 100644 --- a/packages/overlays/IconShapeSquircleOverlay/res/values/strings.xml +++ b/packages/overlays/IconShapeSquircleOverlay/res/values/strings.xml @@ -18,6 +18,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Squircle icon shape overlay --> - <string name="icon_shape_squircle_overlay" translatable="false">Square Icons</string> + <string name="icon_shape_squircle_overlay" translatable="false">Squircle</string> </resources> diff --git a/packages/overlays/IconShapeTeardropOverlay/res/values/strings.xml b/packages/overlays/IconShapeTeardropOverlay/res/values/strings.xml index d946ee8f97f2..db9fa9819714 100644 --- a/packages/overlays/IconShapeTeardropOverlay/res/values/strings.xml +++ b/packages/overlays/IconShapeTeardropOverlay/res/values/strings.xml @@ -18,6 +18,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Teardrop icon overlay --> - <string name="icon_shape_teardrop_overlay" translatable="false">Teardrop Icons</string> + <string name="icon_shape_teardrop_overlay" translatable="false">Teardrop</string> </resources> diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto index 3180b479b520..2b399defc21b 100644 --- a/proto/src/metrics_constants/metrics_constants.proto +++ b/proto/src/metrics_constants/metrics_constants.proto @@ -3684,7 +3684,7 @@ message MetricsEvent { ACTION_SETTINGS_TILE_CLICK = 830; // OPEN: Notification unsnoozed. CLOSE: Notification snoozed. UPDATE: snoozed notification - // updated + // updated. TYPE_DISMISS: snoozing canceled due to data being cleared on package // CATEGORY: NOTIFICATION // OS: O NOTIFICATION_SNOOZED = 831; @@ -6730,6 +6730,11 @@ message MetricsEvent { // OS: Q ZEN_CUSTOM_SETTINGS_DIALOG = 1612; + // OPEN: Settings > Developer Options > Game Update Packages + // CATEGORY: SETTINGS + // OS: Q + SETTINGS_GUP_DASHBOARD = 1613; + // ---- End Q Constants, all Q constants go above this line ---- // Add new aosp constants above this line. diff --git a/services/accessibility/TEST_MAPPING b/services/accessibility/TEST_MAPPING index 320924c954f8..d90c3bd9b4c2 100644 --- a/services/accessibility/TEST_MAPPING +++ b/services/accessibility/TEST_MAPPING @@ -7,7 +7,7 @@ "include-annotation": "android.platform.test.annotations.Presubmit" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -18,7 +18,7 @@ "include-annotation": "android.platform.test.annotations.Presubmit" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -29,7 +29,7 @@ "include-annotation": "android.platform.test.annotations.Presubmit" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -40,7 +40,7 @@ "include-filter": "com.android.server.accessibility" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -51,7 +51,7 @@ "include-filter": "com.android.internal.accessibility" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -62,7 +62,7 @@ "include-filter": "android.view.accessibility" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 8b07db7fc32d..6bd399042b29 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -127,7 +127,7 @@ public class BackupManagerService { protected void startServiceForUser(int userId) { UserBackupManagerService userBackupManagerService = UserBackupManagerService.createAndInitializeService( - userId, mContext, mTrampoline, mBackupThread, mTransportWhitelist); + userId, mContext, mTrampoline, mTransportWhitelist); startServiceForUser(userId, userBackupManagerService); } @@ -152,7 +152,11 @@ public class BackupManagerService { /** Stops the backup service for user {@code userId} when the user is stopped. */ @VisibleForTesting protected void stopServiceForUser(int userId) { - mServiceUsers.remove(userId); + UserBackupManagerService userBackupManagerService = mServiceUsers.removeReturnOld(userId); + + if (userBackupManagerService != null) { + userBackupManagerService.tearDownService(); + } } SparseArray<UserBackupManagerService> getServiceUsers() { diff --git a/services/backup/java/com/android/server/backup/FullBackupJob.java b/services/backup/java/com/android/server/backup/FullBackupJob.java index 82638b4ecee4..5708b1c36822 100644 --- a/services/backup/java/com/android/server/backup/FullBackupJob.java +++ b/services/backup/java/com/android/server/backup/FullBackupJob.java @@ -24,15 +24,12 @@ import android.content.ComponentName; import android.content.Context; public class FullBackupJob extends JobService { - private static final String TAG = "FullBackupJob"; - private static final boolean DEBUG = true; - private static ComponentName sIdleService = new ComponentName("android", FullBackupJob.class.getName()); private static final int JOB_ID = 0x5038; - JobParameters mParams; + private JobParameters mParams; public static void schedule(Context ctx, long minDelay, BackupManagerConstants constants) { JobScheduler js = (JobScheduler) ctx.getSystemService(Context.JOB_SCHEDULER_SERVICE); diff --git a/services/backup/java/com/android/server/backup/KeyValueAdbRestoreEngine.java b/services/backup/java/com/android/server/backup/KeyValueAdbRestoreEngine.java index bed520e9f068..3184bd87601a 100644 --- a/services/backup/java/com/android/server/backup/KeyValueAdbRestoreEngine.java +++ b/services/backup/java/com/android/server/backup/KeyValueAdbRestoreEngine.java @@ -13,8 +13,6 @@ import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.Slog; -import com.android.server.backup.restore.PerformAdbRestoreTask; - import libcore.io.IoUtils; import java.io.File; @@ -42,11 +40,10 @@ public class KeyValueAdbRestoreEngine implements Runnable { private final UserBackupManagerService mBackupManagerService; private final File mDataDir; - FileMetadata mInfo; - PerformAdbRestoreTask mRestoreTask; - ParcelFileDescriptor mInFD; - IBackupAgent mAgent; - int mToken; + private final FileMetadata mInfo; + private final ParcelFileDescriptor mInFD; + private final IBackupAgent mAgent; + private final int mToken; public KeyValueAdbRestoreEngine(UserBackupManagerService backupManagerService, File dataDir, FileMetadata info, ParcelFileDescriptor inFD, IBackupAgent agent, diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerFiles.java b/services/backup/java/com/android/server/backup/UserBackupManagerFiles.java index a0feaf9c8d15..aabd41a611a1 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerFiles.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerFiles.java @@ -17,29 +17,35 @@ package com.android.server.backup; import android.os.Environment; +import android.os.UserHandle; import java.io.File; /** Directories used for user specific backup/restore persistent state and book-keeping. */ -public final class UserBackupManagerFiles { +final class UserBackupManagerFiles { // Name of the directories the service stores bookkeeping data under. private static final String BACKUP_PERSISTENT_DIR = "backup"; private static final String BACKUP_STAGING_DIR = "backup_stage"; + private static File getBaseDir(int userId) { + return Environment.getDataSystemCeDirectory(userId); + } + static File getBaseStateDir(int userId) { - // TODO (b/120424138) this should be per user + if (userId != UserHandle.USER_SYSTEM) { + return new File(getBaseDir(userId), BACKUP_PERSISTENT_DIR); + } + // TODO (b/120424138) remove if clause above and use same logic for system user. + // simultaneously, copy below dir to new system user dir return new File(Environment.getDataDirectory(), BACKUP_PERSISTENT_DIR); } static File getDataDir(int userId) { - // TODO (b/120424138) this should be per user - // This dir on /cache is managed directly in init.rc + if (userId != UserHandle.USER_SYSTEM) { + return new File(getBaseDir(userId), BACKUP_STAGING_DIR); + } + // TODO (b/120424138) remove if clause above and use same logic for system user. Since this + // is a staging dir, we dont need to copy below dir to new system user dir return new File(Environment.getDownloadCacheDirectory(), BACKUP_STAGING_DIR); } - - /** Directory used by full backup engine to store state. */ - public static File getFullBackupEngineFilesDir(int userId) { - // TODO (b/120424138) this should be per user - return new File("/data/system"); - } } diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index 6425508829ce..bfaa22117d19 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -110,9 +110,9 @@ import com.android.server.backup.internal.ClearDataObserver; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.internal.Operation; import com.android.server.backup.internal.PerformInitializeTask; -import com.android.server.backup.internal.ProvisionedObserver; import com.android.server.backup.internal.RunBackupReceiver; import com.android.server.backup.internal.RunInitializeReceiver; +import com.android.server.backup.internal.SetupObserver; import com.android.server.backup.keyvalue.BackupRequest; import com.android.server.backup.params.AdbBackupParams; import com.android.server.backup.params.AdbParams; @@ -208,8 +208,8 @@ public class UserBackupManagerService { public static final String RUN_BACKUP_ACTION = "android.app.backup.intent.RUN"; public static final String RUN_INITIALIZE_ACTION = "android.app.backup.intent.INIT"; - public static final String BACKUP_FINISHED_ACTION = "android.intent.action.BACKUP_FINISHED"; - public static final String BACKUP_FINISHED_PACKAGE_EXTRA = "packageName"; + private static final String BACKUP_FINISHED_ACTION = "android.intent.action.BACKUP_FINISHED"; + private static final String BACKUP_FINISHED_PACKAGE_EXTRA = "packageName"; // Bookkeeping of in-flight operations. The operation token is the index of the entry in the // pending operations list. @@ -245,26 +245,27 @@ public class UserBackupManagerService { private final @UserIdInt int mUserId; private final BackupAgentTimeoutParameters mAgentTimeoutParameters; private final TransportManager mTransportManager; + private final HandlerThread mUserBackupThread; - private Context mContext; - private PackageManager mPackageManager; - private IPackageManager mPackageManagerBinder; - private IActivityManager mActivityManager; + private final Context mContext; + private final PackageManager mPackageManager; + private final IPackageManager mPackageManagerBinder; + private final IActivityManager mActivityManager; private PowerManager mPowerManager; - private AlarmManager mAlarmManager; - private IStorageManager mStorageManager; - private BackupManagerConstants mConstants; - private PowerManager.WakeLock mWakelock; - private BackupHandler mBackupHandler; + private final AlarmManager mAlarmManager; + private final IStorageManager mStorageManager; + private final BackupManagerConstants mConstants; + private final PowerManager.WakeLock mWakelock; + private final BackupHandler mBackupHandler; - private IBackupManager mBackupManagerBinder; + private final IBackupManager mBackupManagerBinder; private boolean mEnabled; // access to this is synchronized on 'this' - private boolean mProvisioned; + private boolean mSetupComplete; private boolean mAutoRestore; - private PendingIntent mRunBackupIntent; - private PendingIntent mRunInitIntent; + private final PendingIntent mRunBackupIntent; + private final PendingIntent mRunInitIntent; private final ArraySet<String> mPendingInits = new ArraySet<>(); // transport names @@ -272,7 +273,7 @@ public class UserBackupManagerService { private final SparseArray<HashSet<String>> mBackupParticipants = new SparseArray<>(); // Backups that we haven't started yet. Keys are package names. - private HashMap<String, BackupRequest> mPendingBackups = new HashMap<>(); + private final HashMap<String, BackupRequest> mPendingBackups = new HashMap<>(); // locking around the pending-backup management private final Object mQueueLock = new Object(); @@ -314,9 +315,6 @@ public class UserBackupManagerService { private ActiveRestoreSession mActiveRestoreSession; - // Watch the device provisioning operation during setup - private ContentObserver mProvisionedObserver; - /** * mCurrentOperations contains the list of currently active operations. * @@ -342,7 +340,7 @@ public class UserBackupManagerService { private final SparseArray<Operation> mCurrentOperations = new SparseArray<>(); private final Object mCurrentOpLock = new Object(); private final Random mTokenGenerator = new Random(); - final AtomicInteger mNextToken = new AtomicInteger(); + private final AtomicInteger mNextToken = new AtomicInteger(); // Where we keep our journal files and other bookkeeping. private final File mBaseStateDir; @@ -350,7 +348,7 @@ public class UserBackupManagerService { private final File mJournalDir; @Nullable private DataChangedJournal mJournal; - private File mFullBackupScheduleFile; + private final File mFullBackupScheduleFile; // Keep a log of all the apps we've ever backed up. private ProcessedPackagesJournal mProcessedPackagesJournal; @@ -371,11 +369,10 @@ public class UserBackupManagerService { @UserIdInt int userId, Context context, Trampoline trampoline, - HandlerThread backupThread, Set<ComponentName> transportWhitelist) { String currentTransport = - Settings.Secure.getString( - context.getContentResolver(), Settings.Secure.BACKUP_TRANSPORT); + Settings.Secure.getStringForUser( + context.getContentResolver(), Settings.Secure.BACKUP_TRANSPORT, userId); if (TextUtils.isEmpty(currentTransport)) { currentTransport = null; } @@ -389,8 +386,21 @@ public class UserBackupManagerService { File baseStateDir = UserBackupManagerFiles.getBaseStateDir(userId); File dataDir = UserBackupManagerFiles.getDataDir(userId); + HandlerThread userBackupThread = + new HandlerThread("backup-" + userId, Process.THREAD_PRIORITY_BACKGROUND); + userBackupThread.start(); + if (DEBUG) { + Slog.d(TAG, "Started thread " + userBackupThread.getName() + " for user " + userId); + } + return createAndInitializeService( - userId, context, trampoline, backupThread, baseStateDir, dataDir, transportManager); + userId, + context, + trampoline, + userBackupThread, + baseStateDir, + dataDir, + transportManager); } /** @@ -399,7 +409,7 @@ public class UserBackupManagerService { * @param userId The user which this service is for. * @param context The system server context. * @param trampoline A reference to the proxy to {@link BackupManagerService}. - * @param backupThread The thread running backup/restore operations for the user. + * @param userBackupThread The thread running backup/restore operations for the user. * @param baseStateDir The directory we store the user's persistent bookkeeping data. * @param dataDir The directory we store the user's temporary staging data. * @param transportManager The {@link TransportManager} responsible for handling the user's @@ -410,19 +420,38 @@ public class UserBackupManagerService { @UserIdInt int userId, Context context, Trampoline trampoline, - HandlerThread backupThread, + HandlerThread userBackupThread, File baseStateDir, File dataDir, TransportManager transportManager) { return new UserBackupManagerService( - userId, context, trampoline, backupThread, baseStateDir, dataDir, transportManager); + userId, + context, + trampoline, + userBackupThread, + baseStateDir, + dataDir, + transportManager); + } + + /** + * Returns the value of {@link Settings.Secure#USER_SETUP_COMPLETE} for the specified user + * {@code userId} as a {@code boolean}. + */ + public static boolean getSetupCompleteSettingForUser(Context context, int userId) { + return Settings.Secure.getIntForUser( + context.getContentResolver(), + Settings.Secure.USER_SETUP_COMPLETE, + 0, + userId) + != 0; } private UserBackupManagerService( @UserIdInt int userId, Context context, Trampoline parent, - HandlerThread backupThread, + HandlerThread userBackupThread, File baseStateDir, File dataDir, TransportManager transportManager) { @@ -443,21 +472,22 @@ public class UserBackupManagerService { BackupAgentTimeoutParameters(Handler.getMain(), mContext.getContentResolver()); mAgentTimeoutParameters.start(); - // spin up the backup/restore handler thread - checkNotNull(backupThread, "backupThread cannot be null"); - mBackupHandler = new BackupHandler(this, backupThread.getLooper()); + checkNotNull(userBackupThread, "userBackupThread cannot be null"); + mUserBackupThread = userBackupThread; + mBackupHandler = new BackupHandler(this, userBackupThread.getLooper()); // Set up our bookkeeping final ContentResolver resolver = context.getContentResolver(); - mProvisioned = Settings.Global.getInt(resolver, - Settings.Global.DEVICE_PROVISIONED, 0) != 0; - mAutoRestore = Settings.Secure.getInt(resolver, - Settings.Secure.BACKUP_AUTO_RESTORE, 1) != 0; + mSetupComplete = getSetupCompleteSettingForUser(context, userId); + mAutoRestore = Settings.Secure.getIntForUser(resolver, + Settings.Secure.BACKUP_AUTO_RESTORE, 1, userId) != 0; - mProvisionedObserver = new ProvisionedObserver(this, mBackupHandler); + ContentObserver setupObserver = new SetupObserver(this, mBackupHandler); resolver.registerContentObserver( - Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED), - false, mProvisionedObserver); + Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE), + /* notifyForDescendents */ false, + setupObserver, + mUserId); mBaseStateDir = checkNotNull(baseStateDir, "baseStateDir cannot be null"); mBaseStateDir.mkdirs(); @@ -526,6 +556,15 @@ public class UserBackupManagerService { mWakelock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*backup*"); } + /** Cleans up state when the user of this service is stopped. */ + void tearDownService() { + mUserBackupThread.quit(); + } + + public @UserIdInt int getUserId() { + return mUserId; + } + public BackupManagerConstants getConstants() { return mConstants; } @@ -538,51 +577,27 @@ public class UserBackupManagerService { return mContext; } - public void setContext(Context context) { - mContext = context; - } - public PackageManager getPackageManager() { return mPackageManager; } - public void setPackageManager(PackageManager packageManager) { - mPackageManager = packageManager; - } - public IPackageManager getPackageManagerBinder() { return mPackageManagerBinder; } - public void setPackageManagerBinder(IPackageManager packageManagerBinder) { - mPackageManagerBinder = packageManagerBinder; - } - public IActivityManager getActivityManager() { return mActivityManager; } - public void setActivityManager(IActivityManager activityManager) { - mActivityManager = activityManager; - } - public AlarmManager getAlarmManager() { return mAlarmManager; } - public void setAlarmManager(AlarmManager alarmManager) { - mAlarmManager = alarmManager; - } - @VisibleForTesting void setPowerManager(PowerManager powerManager) { mPowerManager = powerManager; } - public void setBackupManagerBinder(IBackupManager backupManagerBinder) { - mBackupManagerBinder = backupManagerBinder; - } - public TransportManager getTransportManager() { return mTransportManager; } @@ -595,12 +610,12 @@ public class UserBackupManagerService { mEnabled = enabled; } - public boolean isProvisioned() { - return mProvisioned; + public boolean isSetupComplete() { + return mSetupComplete; } - public void setProvisioned(boolean provisioned) { - mProvisioned = provisioned; + public void setSetupComplete(boolean setupComplete) { + mSetupComplete = setupComplete; } public PowerManager.WakeLock getWakelock() { @@ -617,35 +632,18 @@ public class UserBackupManagerService { mWakelock.setWorkSource(workSource); } - public void setWakelock(PowerManager.WakeLock wakelock) { - mWakelock = wakelock; - } - public Handler getBackupHandler() { return mBackupHandler; } - public void setBackupHandler(BackupHandler backupHandler) { - mBackupHandler = backupHandler; - } - public PendingIntent getRunInitIntent() { return mRunInitIntent; } - public void setRunInitIntent(PendingIntent runInitIntent) { - mRunInitIntent = runInitIntent; - } - public HashMap<String, BackupRequest> getPendingBackups() { return mPendingBackups; } - public void setPendingBackups( - HashMap<String, BackupRequest> pendingBackups) { - mPendingBackups = pendingBackups; - } - public Object getQueueLock() { return mQueueLock; } @@ -658,10 +656,6 @@ public class UserBackupManagerService { mBackupRunning = backupRunning; } - public long getLastBackupPass() { - return mLastBackupPass; - } - public void setLastBackupPass(long lastBackupPass) { mLastBackupPass = lastBackupPass; } @@ -670,10 +664,6 @@ public class UserBackupManagerService { return mClearDataLock; } - public boolean isClearingData() { - return mClearingData; - } - public void setClearingData(boolean clearingData) { mClearingData = clearingData; } @@ -694,11 +684,6 @@ public class UserBackupManagerService { return mActiveRestoreSession; } - public void setActiveRestoreSession( - ActiveRestoreSession activeRestoreSession) { - mActiveRestoreSession = activeRestoreSession; - } - public SparseArray<Operation> getCurrentOperations() { return mCurrentOperations; } @@ -732,18 +717,10 @@ public class UserBackupManagerService { return mRng; } - public Set<String> getAncestralPackages() { - return mAncestralPackages; - } - public void setAncestralPackages(Set<String> ancestralPackages) { mAncestralPackages = ancestralPackages; } - public long getAncestralToken() { - return mAncestralToken; - } - public void setAncestralToken(long ancestralToken) { mAncestralToken = ancestralToken; } @@ -1553,11 +1530,16 @@ public class UserBackupManagerService { throw new IllegalArgumentException("No packages are provided for backup"); } - if (!mEnabled || !mProvisioned) { - Slog.i(TAG, "Backup requested but e=" + mEnabled + " p=" + mProvisioned); + if (!mEnabled || !mSetupComplete) { + Slog.i( + TAG, + "Backup requested but enabled=" + + mEnabled + + " setupComplete=" + + mSetupComplete); BackupObserverUtils.sendBackupFinished(observer, BackupManager.ERROR_BACKUP_NOT_ALLOWED); - final int logTag = mProvisioned + final int logTag = mSetupComplete ? BackupManagerMonitor.LOG_EVENT_ID_BACKUP_DISABLED : BackupManagerMonitor.LOG_EVENT_ID_DEVICE_NOT_PROVISIONED; monitor = BackupManagerMonitorUtils.monitorEvent(monitor, logTag, null, @@ -1992,13 +1974,13 @@ public class UserBackupManagerService { FullBackupEntry entry = null; long latency = fullBackupInterval; - if (!mEnabled || !mProvisioned) { + if (!mEnabled || !mSetupComplete) { // Backups are globally disabled, so don't proceed. We also don't reschedule // the job driving automatic backups; that job will be scheduled again when // the user enables backup. if (MORE_DEBUG) { - Slog.i(TAG, "beginFullBackup but e=" + mEnabled - + " p=" + mProvisioned + "; ignoring"); + Slog.i(TAG, "beginFullBackup but enabled=" + mEnabled + + " setupComplete=" + mSetupComplete + "; ignoring"); } return false; } @@ -2399,12 +2381,6 @@ public class UserBackupManagerService { } } - /** Returns {@code true} if the system user has gone through SUW. */ - public boolean deviceIsProvisioned() { - final ContentResolver resolver = mContext.getContentResolver(); - return (Settings.Global.getInt(resolver, Settings.Global.DEVICE_PROVISIONED, 0) != 0); - } - /** * Used by 'adb backup' to run a backup pass for packages supplied via the command line, writing * the resulting data stream to the supplied {@code fd}. This method is synchronous and does not @@ -2437,8 +2413,7 @@ public class UserBackupManagerService { long oldId = Binder.clearCallingIdentity(); try { - // Doesn't make sense to do a full backup prior to setup - if (!deviceIsProvisioned()) { + if (!mSetupComplete) { Slog.i(TAG, "Backup not supported before setup"); return; } @@ -2564,9 +2539,7 @@ public class UserBackupManagerService { long oldId = Binder.clearCallingIdentity(); try { - // Check whether the device has been provisioned -- we don't handle - // full restores prior to completing the setup process. - if (!deviceIsProvisioned()) { + if (!mSetupComplete) { Slog.i(TAG, "Full restore not permitted before setup"); return; } @@ -2721,7 +2694,7 @@ public class UserBackupManagerService { } synchronized (mQueueLock) { - if (enable && !wasEnabled && mProvisioned) { + if (enable && !wasEnabled && mSetupComplete) { // if we've just been enabled, start scheduling backup passes KeyValueBackupJob.schedule(mContext, mConstants); scheduleNextFullBackupJob(0); @@ -2734,7 +2707,7 @@ public class UserBackupManagerService { // This also constitutes an opt-out, so we wipe any data for // this device from the backend. We start that process with // an alarm in order to guarantee wakelock states. - if (wasEnabled && mProvisioned) { + if (wasEnabled && mSetupComplete) { // NOTE: we currently flush every registered transport, not just // the currently-active one. List<String> transportNames = new ArrayList<>(); @@ -2782,8 +2755,8 @@ public class UserBackupManagerService { final long oldId = Binder.clearCallingIdentity(); try { synchronized (this) { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.BACKUP_AUTO_RESTORE, doAutoRestore ? 1 : 0); + Settings.Secure.putIntForUser(mContext.getContentResolver(), + Settings.Secure.BACKUP_AUTO_RESTORE, doAutoRestore ? 1 : 0, mUserId); mAutoRestore = doAutoRestore; } } finally { @@ -2996,8 +2969,8 @@ public class UserBackupManagerService { private void updateStateForTransport(String newTransportName) { // Publish the name change - Settings.Secure.putString(mContext.getContentResolver(), - Settings.Secure.BACKUP_TRANSPORT, newTransportName); + Settings.Secure.putStringForUser(mContext.getContentResolver(), + Settings.Secure.BACKUP_TRANSPORT, newTransportName, mUserId); // And update our current-dataset bookkeeping String callerLogString = "BMS.updateStateForTransport()"; @@ -3112,8 +3085,7 @@ public class UserBackupManagerService { synchronized (mAgentConnectLock) { if (Binder.getCallingUid() == Process.SYSTEM_UID) { Slog.d(TAG, "agentConnected pkg=" + packageName + " agent=" + agentBinder); - IBackupAgent agent = IBackupAgent.Stub.asInterface(agentBinder); - mConnectedAgent = agent; + mConnectedAgent = IBackupAgent.Stub.asInterface(agentBinder); mConnecting = false; } else { Slog.w(TAG, "Non-system process uid=" + Binder.getCallingUid() @@ -3431,7 +3403,7 @@ public class UserBackupManagerService { private void dumpInternal(PrintWriter pw) { synchronized (mQueueLock) { pw.println("Backup Manager is " + (mEnabled ? "enabled" : "disabled") - + " / " + (!mProvisioned ? "not " : "") + "provisioned / " + + " / " + (!mSetupComplete ? "not " : "") + "setup complete / " + (this.mPendingInits.size() == 0 ? "not " : "") + "pending init"); pw.println("Auto-restore is " + (mAutoRestore ? "enabled" : "disabled")); if (mBackupRunning) pw.println("Backup currently running"); diff --git a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java index 45ca2af54b52..03d4e97cb998 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java +++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java @@ -34,14 +34,12 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.ParcelFileDescriptor; import android.os.RemoteException; -import android.os.UserHandle; import android.util.Slog; import com.android.internal.util.Preconditions; import com.android.server.AppWidgetBackupBridge; import com.android.server.backup.BackupAgentTimeoutParameters; import com.android.server.backup.BackupRestoreTask; -import com.android.server.backup.UserBackupManagerFiles; import com.android.server.backup.UserBackupManagerService; import com.android.server.backup.remote.RemoteCall; import com.android.server.backup.utils.FullBackupUtils; @@ -78,21 +76,21 @@ public class FullBackupEngine { private final File mFilesDir; FullBackupRunner( + UserBackupManagerService userBackupManagerService, PackageInfo packageInfo, IBackupAgent agent, ParcelFileDescriptor pipe, int token, boolean includeApks) throws IOException { - // TODO: http://b/22388012 - mUserId = UserHandle.USER_SYSTEM; + mUserId = userBackupManagerService.getUserId(); mPackageManager = backupManagerService.getPackageManager(); mPackage = packageInfo; mAgent = agent; mPipe = ParcelFileDescriptor.dup(pipe.getFileDescriptor()); mToken = token; mIncludeApks = includeApks; - mFilesDir = UserBackupManagerFiles.getFullBackupEngineFilesDir(mUserId); + mFilesDir = userBackupManagerService.getDataDir(); } @Override @@ -155,9 +153,12 @@ public class FullBackupEngine { backupManagerService.getBackupManagerBinder(), mTransportFlags); } catch (IOException e) { - Slog.e(TAG, "Error running full backup for " + mPackage.packageName); + Slog.e(TAG, "Error running full backup for " + mPackage.packageName, e); } catch (RemoteException e) { - Slog.e(TAG, "Remote agent vanished during full backup of " + mPackage.packageName); + Slog.e( + TAG, + "Remote agent vanished during full backup of " + mPackage.packageName, + e); } finally { try { mPipe.close(); @@ -233,7 +234,13 @@ public class FullBackupEngine { pipes = ParcelFileDescriptor.createPipe(); FullBackupRunner runner = - new FullBackupRunner(mPkg, mAgent, pipes[1], mOpToken, mIncludeApks); + new FullBackupRunner( + backupManagerService, + mPkg, + mAgent, + pipes[1], + mOpToken, + mIncludeApks); pipes[1].close(); // the runner has dup'd it pipes[1] = null; Thread t = new Thread(runner, "app-data-runner"); diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index 5b449c5b400e..2ee96d190f90 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -317,16 +317,16 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba int backupRunStatus = BackupManager.SUCCESS; try { - if (!backupManagerService.isEnabled() || !backupManagerService.isProvisioned()) { + if (!backupManagerService.isEnabled() || !backupManagerService.isSetupComplete()) { // Backups are globally disabled, so don't proceed. if (DEBUG) { Slog.i(TAG, "full backup requested but enabled=" + backupManagerService .isEnabled() - + " provisioned=" + backupManagerService.isProvisioned() + + " setupComplete=" + backupManagerService.isSetupComplete() + "; ignoring"); } int monitoringEvent; - if (backupManagerService.isProvisioned()) { + if (backupManagerService.isSetupComplete()) { monitoringEvent = BackupManagerMonitor.LOG_EVENT_ID_BACKUP_DISABLED; } else { monitoringEvent = BackupManagerMonitor.LOG_EVENT_ID_DEVICE_NOT_PROVISIONED; diff --git a/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java b/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java deleted file mode 100644 index 7e2ac796d343..000000000000 --- a/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java +++ /dev/null @@ -1,62 +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.server.backup.internal; - -import static com.android.server.backup.BackupManagerService.MORE_DEBUG; -import static com.android.server.backup.BackupManagerService.TAG; - -import android.database.ContentObserver; -import android.os.Handler; -import android.util.Slog; - -import com.android.server.backup.KeyValueBackupJob; -import com.android.server.backup.UserBackupManagerService; - -public class ProvisionedObserver extends ContentObserver { - - private UserBackupManagerService backupManagerService; - - public ProvisionedObserver( - UserBackupManagerService backupManagerService, Handler handler) { - super(handler); - this.backupManagerService = backupManagerService; - } - - public void onChange(boolean selfChange) { - final boolean wasProvisioned = backupManagerService.isProvisioned(); - final boolean isProvisioned = backupManagerService.deviceIsProvisioned(); - // latch: never unprovision - backupManagerService.setProvisioned(wasProvisioned || isProvisioned); - if (MORE_DEBUG) { - Slog.d(TAG, "Provisioning change: was=" + wasProvisioned - + " is=" + isProvisioned + " now=" + backupManagerService.isProvisioned()); - } - - synchronized (backupManagerService.getQueueLock()) { - if (backupManagerService.isProvisioned() && !wasProvisioned - && backupManagerService.isEnabled()) { - // we're now good to go, so start the backup alarms - if (MORE_DEBUG) { - Slog.d(TAG, "Now provisioned, so starting backups"); - } - KeyValueBackupJob.schedule(backupManagerService.getContext(), - backupManagerService.getConstants()); - backupManagerService.scheduleNextFullBackupJob(0); - } - } - } -} diff --git a/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java b/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java index 2a5d913226b9..3b877241f7f4 100644 --- a/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java +++ b/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java @@ -59,7 +59,8 @@ public class RunBackupReceiver extends BroadcastReceiver { } else { // Don't run backups now if we're disabled or not yet // fully set up. - if (backupManagerService.isEnabled() && backupManagerService.isProvisioned()) { + if (backupManagerService.isEnabled() + && backupManagerService.isSetupComplete()) { if (!backupManagerService.isBackupRunning()) { if (DEBUG) { Slog.v(TAG, "Running a backup pass"); @@ -77,8 +78,8 @@ public class RunBackupReceiver extends BroadcastReceiver { Slog.i(TAG, "Backup time but one already running"); } } else { - Slog.w(TAG, "Backup pass but e=" + backupManagerService.isEnabled() + " p=" - + backupManagerService.isProvisioned()); + Slog.w(TAG, "Backup pass but enabled=" + backupManagerService.isEnabled() + + " setupComplete=" + backupManagerService.isSetupComplete()); } } } diff --git a/services/backup/java/com/android/server/backup/internal/SetupObserver.java b/services/backup/java/com/android/server/backup/internal/SetupObserver.java new file mode 100644 index 000000000000..defcacc50a18 --- /dev/null +++ b/services/backup/java/com/android/server/backup/internal/SetupObserver.java @@ -0,0 +1,85 @@ +/* + * 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.backup.internal; + +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.TAG; +import static com.android.server.backup.UserBackupManagerService.getSetupCompleteSettingForUser; + +import android.content.Context; +import android.database.ContentObserver; +import android.os.Handler; +import android.provider.Settings; +import android.util.Slog; + +import com.android.server.backup.KeyValueBackupJob; +import com.android.server.backup.UserBackupManagerService; + +/** + * A {@link ContentObserver} for changes to the setting {@link Settings.Secure#USER_SETUP_COMPLETE} + * for a particular user. + */ +public class SetupObserver extends ContentObserver { + private final UserBackupManagerService mUserBackupManagerService; + private final Context mContext; + private final int mUserId; + + public SetupObserver(UserBackupManagerService userBackupManagerService, Handler handler) { + super(handler); + mUserBackupManagerService = userBackupManagerService; + mContext = userBackupManagerService.getContext(); + mUserId = userBackupManagerService.getUserId(); + } + + /** + * Callback that executes when the setting {@link Settings.Secure#USER_SETUP_COMPLETE} changes + * for the user {@link #mUserId}. If the user is newly setup and backup is enabled, then we + * schedule a key value and full backup job for the user. If the user was previously setup and + * now the setting has changed to {@code false}, we don't reset the state as having gone through + * setup is a non-reversible action. + */ + public void onChange(boolean selfChange) { + boolean previousSetupComplete = mUserBackupManagerService.isSetupComplete(); + boolean newSetupComplete = getSetupCompleteSettingForUser(mContext, mUserId); + + boolean resolvedSetupComplete = previousSetupComplete || newSetupComplete; + mUserBackupManagerService.setSetupComplete(resolvedSetupComplete); + if (MORE_DEBUG) { + Slog.d( + TAG, + "Setup complete change: was=" + + previousSetupComplete + + " new=" + + newSetupComplete + + " resolved=" + + resolvedSetupComplete); + } + + synchronized (mUserBackupManagerService.getQueueLock()) { + // Start backup if the user is newly setup and backup is enabled. + if (resolvedSetupComplete + && !previousSetupComplete + && mUserBackupManagerService.isEnabled()) { + if (MORE_DEBUG) { + Slog.d(TAG, "Setup complete so starting backups"); + } + KeyValueBackupJob.schedule(mContext, mUserBackupManagerService.getConstants()); + mUserBackupManagerService.scheduleNextFullBackupJob(0); + } + } + } +} diff --git a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java index 0d26ea56faa2..45a398f80351 100644 --- a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java +++ b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java @@ -678,12 +678,13 @@ public class FullRestoreEngine extends RestoreEngine { * Returns whether the package is in the list of the packages for which clear app data should * be called despite the fact that they have backup agent. * - * <p>The list is read from {@link Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE}. + * <p>The list is read from {@link Settings.Secure#PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE}. */ private boolean shouldForceClearAppDataOnFullRestore(String packageName) { - String packageListString = Settings.Secure.getString( + String packageListString = Settings.Secure.getStringForUser( mBackupManagerService.getContext().getContentResolver(), - Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE); + Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE, + mBackupManagerService.getUserId()); if (TextUtils.isEmpty(packageListString)) { return false; } diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java index 06dc9188d1ee..f27d37315ada 100644 --- a/services/core/java/com/android/server/PackageWatchdog.java +++ b/services/core/java/com/android/server/PackageWatchdog.java @@ -19,10 +19,7 @@ package com.android.server; import android.content.Context; import android.os.Environment; import android.os.Handler; -import android.os.HandlerThread; import android.os.Looper; -import android.os.Message; -import android.os.Process; import android.os.SystemClock; import android.text.TextUtils; import android.util.ArrayMap; @@ -32,6 +29,7 @@ import android.util.Slog; import android.util.Xml; import com.android.internal.annotations.GuardedBy; +import com.android.internal.os.BackgroundThread; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.XmlUtils; @@ -50,8 +48,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; /** * Monitors the health of packages on the system and notifies interested observers when packages @@ -70,7 +66,6 @@ public class PackageWatchdog { private static final String ATTR_VERSION = "version"; private static final String ATTR_NAME = "name"; private static final String ATTR_DURATION = "duration"; - private static final int MESSAGE_SAVE_FILE = 1; private static PackageWatchdog sPackageWatchdog; @@ -79,20 +74,21 @@ public class PackageWatchdog { private final Context mContext; // Handler to run package cleanup runnables private final Handler mTimerHandler; - private final HandlerThread mIoThread = new HandlerThread("package_watchdog_io", - Process.THREAD_PRIORITY_BACKGROUND); private final Handler mIoHandler; - // Maps observer names to package observers that have been registered since the last boot + // Contains (observer-name -> external-observer-handle) that have been registered during the + // current boot. + // It is populated when observers call #registerHealthObserver and it does not survive reboots. @GuardedBy("mLock") - final Map<String, PackageHealthObserver> mRegisteredObservers = new ArrayMap<>(); - // Maps observer names to internal observers (registered or not) loaded from file + final ArrayMap<String, PackageHealthObserver> mRegisteredObservers = new ArrayMap<>(); + // Contains (observer-name -> internal-observer-handle) that have ever been registered from + // previous boots. Observers with all packages expired are periodically pruned. + // It is saved to disk on system shutdown and repouplated on startup so it survives reboots. @GuardedBy("mLock") - final Map<String, ObserverInternal> mAllObservers = new ArrayMap<>(); - // /data/system/ directory - private final File mSystemDir = new File(Environment.getDataDirectory(), "system"); - // File containing the XML data of monitored packages + final ArrayMap<String, ObserverInternal> mAllObservers = new ArrayMap<>(); + // File containing the XML data of monitored packages /data/system/package-watchdog.xml private final AtomicFile mPolicyFile = - new AtomicFile(new File(mSystemDir, "package-watchdog.xml")); + new AtomicFile(new File(new File(Environment.getDataDirectory(), "system"), + "package-watchdog.xml")); // Runnable to prune monitored packages that have expired private final Runnable mPackageCleanup; // Last SystemClock#uptimeMillis a package clean up was executed. @@ -105,18 +101,19 @@ public class PackageWatchdog { private PackageWatchdog(Context context) { mContext = context; mTimerHandler = new Handler(Looper.myLooper()); - mIoThread.start(); - mIoHandler = new IoHandler(mIoThread.getLooper()); + mIoHandler = BackgroundThread.getHandler(); mPackageCleanup = this::rescheduleCleanup; loadFromFile(); } /** Creates or gets singleton instance of PackageWatchdog. */ - public static synchronized PackageWatchdog getInstance(Context context) { - if (sPackageWatchdog == null) { - sPackageWatchdog = new PackageWatchdog(context); + public static PackageWatchdog getInstance(Context context) { + synchronized (PackageWatchdog.class) { + if (sPackageWatchdog == null) { + sPackageWatchdog = new PackageWatchdog(context); + } + return sPackageWatchdog; } - return sPackageWatchdog; } /** @@ -140,21 +137,20 @@ public class PackageWatchdog { * {@code observer} of any package failures within the monitoring duration. * * <p>If {@code observer} is already monitoring a package in {@code packageNames}, - * the monitoring window of that package will be reset to {@code hours}. + * the monitoring window of that package will be reset to {@code durationMs}. * * @throws IllegalArgumentException if {@code packageNames} is empty - * or {@code hours} is less than 1 + * or {@code durationMs} is less than 1 */ public void startObservingHealth(PackageHealthObserver observer, List<String> packageNames, - int hours) { - if (packageNames.isEmpty() || hours < 1) { + int durationMs) { + if (packageNames.isEmpty() || durationMs < 1) { throw new IllegalArgumentException("Observation not started, no packages specified" - + "or invalid hours"); + + "or invalid duration"); } - long durationMs = TimeUnit.HOURS.toMillis(hours); List<MonitoredPackage> packages = new ArrayList<>(); - for (String packageName : packageNames) { - packages.add(new MonitoredPackage(packageName, durationMs)); + for (int i = 0; i < packageNames.size(); i++) { + packages.add(new MonitoredPackage(packageNames.get(i), durationMs)); } synchronized (mLock) { ObserverInternal oldObserver = mAllObservers.get(observer.getName()); @@ -173,7 +169,7 @@ public class PackageWatchdog { // Always reschedule because we may need to expire packages // earlier than we are already scheduled for rescheduleCleanup(); - sendIoMessage(MESSAGE_SAVE_FILE); + saveToFileAsync(); } /** @@ -186,7 +182,7 @@ public class PackageWatchdog { mAllObservers.remove(observer.getName()); mRegisteredObservers.remove(observer.getName()); } - sendIoMessage(MESSAGE_SAVE_FILE); + saveToFileAsync(); } // TODO(zezeozue:) Accept current versionCodes of failing packages? @@ -194,30 +190,46 @@ public class PackageWatchdog { * Called when a process fails either due to a crash or ANR. * * <p>All registered observers for the packages contained in the process will be notified in - * order of priority unitl an observer signifies that it has taken action and other observers + * order of priority until an observer signifies that it has taken action and other observers * should not notified. * * <p>This method could be called frequently if there is a severe problem on the device. */ public void onPackageFailure(String[] packages) { + ArrayMap<String, List<PackageHealthObserver>> packagesToReport = new ArrayMap<>(); synchronized (mLock) { if (mRegisteredObservers.isEmpty()) { return; } - for (String packageName : packages) { - for (ObserverInternal observer : mAllObservers.values()) { - if (observer.onPackageFailure(packageName)) { - PackageHealthObserver activeObserver = - mRegisteredObservers.get(observer.mName); - if (activeObserver != null - && activeObserver.onHealthCheckFailed(packageName)) { - // Observer has handled, do not notify other observers - break; - } + + for (int pIndex = 0; pIndex < packages.length; pIndex++) { + for (int oIndex = 0; oIndex < mAllObservers.size(); oIndex++) { + // Observers interested in receiving packageName failures + List<PackageHealthObserver> observersToNotify = new ArrayList<>(); + PackageHealthObserver activeObserver = + mRegisteredObservers.get(mAllObservers.valueAt(oIndex).mName); + if (activeObserver != null) { + observersToNotify.add(activeObserver); + } + + // Save interested observers and notify them outside the lock + if (!observersToNotify.isEmpty()) { + packagesToReport.put(packages[pIndex], observersToNotify); } } } } + + // Notify observers + for (int pIndex = 0; pIndex < packagesToReport.size(); pIndex++) { + List<PackageHealthObserver> observers = packagesToReport.valueAt(pIndex); + for (int oIndex = 0; oIndex < observers.size(); oIndex++) { + if (observers.get(oIndex).onHealthCheckFailed(packages[pIndex])) { + // Observer has handled, do not notify others + break; + } + } + } } // TODO(zezeozue): Optimize write? Maybe only write a separate smaller file? @@ -225,7 +237,7 @@ public class PackageWatchdog { /** Writes the package information to file during shutdown. */ public void writeNow() { if (!mAllObservers.isEmpty()) { - mIoHandler.removeMessages(MESSAGE_SAVE_FILE); + mIoHandler.removeCallbacks(this::saveToFile); pruneObservers(SystemClock.uptimeMillis() - mUptimeAtLastRescheduleMs); saveToFile(); Slog.i(TAG, "Last write to update package durations"); @@ -235,7 +247,7 @@ public class PackageWatchdog { /** Register instances of this interface to receive notifications on package failure. */ public interface PackageHealthObserver { /** - * Called when health check fails for the {@code packages}. + * Called when health check fails for the {@code packageName}. * @return {@code true} if action was taken and other observers should not be notified of * this failure, {@code false} otherwise. */ @@ -283,10 +295,12 @@ public class PackageWatchdog { */ private long getEarliestPackageExpiryLocked() { long shortestDurationMs = Long.MAX_VALUE; - for (ObserverInternal observer : mAllObservers.values()) { - for (MonitoredPackage p : observer.mPackages.values()) { - if (p.mDurationMs < shortestDurationMs) { - shortestDurationMs = p.mDurationMs; + for (int oIndex = 0; oIndex < mAllObservers.size(); oIndex++) { + ArrayMap<String, MonitoredPackage> packages = mAllObservers.valueAt(oIndex).mPackages; + for (int pIndex = 0; pIndex < packages.size(); pIndex++) { + long duration = packages.valueAt(pIndex).mDurationMs; + if (duration < shortestDurationMs) { + shortestDurationMs = duration; } } } @@ -313,7 +327,7 @@ public class PackageWatchdog { } } } - sendIoMessage(MESSAGE_SAVE_FILE); + saveToFileAsync(); } /** @@ -339,59 +353,53 @@ public class PackageWatchdog { } } catch (FileNotFoundException e) { // Nothing to monitor - } catch (IOException e) { - Log.wtf(TAG, "Unable to read monitored packages", e); - } catch (NumberFormatException e) { - Log.wtf(TAG, "Unable to parse monitored package windows", e); - } catch (XmlPullParserException e) { - Log.wtf(TAG, "Unable to parse monitored packages", e); + } catch (IOException | NumberFormatException | XmlPullParserException e) { + Log.wtf(TAG, "Unable to read monitored packages, deleting file", e); + mPolicyFile.delete(); } finally { IoUtils.closeQuietly(infile); } } /** - * Persists mAllObservers to file and ignores threshold information. - * - * <p>Note that this is <b>not</b> thread safe and should only be called on the - * single threaded IoHandler. + * Persists mAllObservers to file. Threshold information is ignored. */ private boolean saveToFile() { - FileOutputStream stream; - try { - stream = mPolicyFile.startWrite(); - } catch (IOException e) { - Slog.w(TAG, "Cannot update monitored packages", e); - return false; - } + synchronized (mLock) { + FileOutputStream stream; + try { + stream = mPolicyFile.startWrite(); + } catch (IOException e) { + Slog.w(TAG, "Cannot update monitored packages", e); + return false; + } - try { - XmlSerializer out = new FastXmlSerializer(); - out.setOutput(stream, StandardCharsets.UTF_8.name()); - out.startDocument(null, true); - out.startTag(null, TAG_PACKAGE_WATCHDOG); - out.attribute(null, ATTR_VERSION, Integer.toString(DB_VERSION)); - for (ObserverInternal observer : mAllObservers.values()) { - observer.write(out); + try { + XmlSerializer out = new FastXmlSerializer(); + out.setOutput(stream, StandardCharsets.UTF_8.name()); + out.startDocument(null, true); + out.startTag(null, TAG_PACKAGE_WATCHDOG); + out.attribute(null, ATTR_VERSION, Integer.toString(DB_VERSION)); + for (int oIndex = 0; oIndex < mAllObservers.size(); oIndex++) { + mAllObservers.valueAt(oIndex).write(out); + } + out.endTag(null, TAG_PACKAGE_WATCHDOG); + out.endDocument(); + mPolicyFile.finishWrite(stream); + return true; + } catch (IOException e) { + Slog.w(TAG, "Failed to save monitored packages, restoring backup", e); + mPolicyFile.failWrite(stream); + return false; + } finally { + IoUtils.closeQuietly(stream); } - out.endTag(null, TAG_PACKAGE_WATCHDOG); - out.endDocument(); - mPolicyFile.finishWrite(stream); - return true; - } catch (IOException e) { - Slog.w(TAG, "Failed to save monitored packages, restoring backup", e); - mPolicyFile.failWrite(stream); - return false; - } finally { - IoUtils.closeQuietly(stream); } } - private void sendIoMessage(int what) { - if (!mIoHandler.hasMessages(what)) { - Message m = Message.obtain(mIoHandler, what); - mIoHandler.sendMessage(m); - } + private void saveToFileAsync() { + mIoHandler.removeCallbacks(this::saveToFile); + mIoHandler.post(this::saveToFile); } /** @@ -435,7 +443,8 @@ public class PackageWatchdog { public void updatePackages(List<MonitoredPackage> packages) { synchronized (mName) { - for (MonitoredPackage p : packages) { + for (int pIndex = 0; pIndex < packages.size(); pIndex++) { + MonitoredPackage p = packages.get(pIndex); mPackages.put(p.mName, p); } } @@ -554,19 +563,4 @@ public class PackageWatchdog { return mFailures >= TRIGGER_FAILURE_COUNT; } } - - private class IoHandler extends Handler { - IoHandler(Looper looper) { - super(looper); - } - - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case MESSAGE_SAVE_FILE: - saveToFile(); - break; - } - } - } } diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index d07cf78e47ed..e10e0d6ef1ce 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1313,16 +1313,17 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } } - public void notifyDataConnection(int state, boolean isDataAllowed, - String reason, String apn, String apnType, LinkProperties linkProperties, - NetworkCapabilities networkCapabilities, int networkType, boolean roaming) { + public void notifyDataConnection(int state, boolean isDataAllowed, String apn, String apnType, + LinkProperties linkProperties, + NetworkCapabilities networkCapabilities, int networkType, + boolean roaming) { notifyDataConnectionForSubscriber(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, state, - isDataAllowed,reason, apn, apnType, linkProperties, - networkCapabilities, networkType, roaming); + isDataAllowed, apn, apnType, linkProperties, + networkCapabilities, networkType, roaming); } - public void notifyDataConnectionForSubscriber(int subId, int state, - boolean isDataAllowed, String reason, String apn, String apnType, + public void notifyDataConnectionForSubscriber(int subId, int state, boolean isDataAllowed, + String apn, String apnType, LinkProperties linkProperties, NetworkCapabilities networkCapabilities, int networkType, boolean roaming) { if (!checkNotifyPermission("notifyDataConnection()" )) { @@ -1331,7 +1332,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { if (VDBG) { log("notifyDataConnectionForSubscriber: subId=" + subId + " state=" + state + " isDataAllowed=" + isDataAllowed - + " reason='" + reason + "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType + " mRecords.size()=" + mRecords.size()); } @@ -1366,7 +1366,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mDataConnectionNetworkType[phoneId] = networkType; } mPreciseDataConnectionState = new PreciseDataConnectionState(state, networkType, - apnType, apn, reason, linkProperties, ""); + apnType, apn, linkProperties, ""); for (Record r : mRecords) { if (r.matchPhoneStateListenerEvent( PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE)) { @@ -1381,30 +1381,29 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } handleRemoveListLocked(); } - broadcastDataConnectionStateChanged(state, isDataAllowed, reason, apn, - apnType, linkProperties, networkCapabilities, roaming, subId); - broadcastPreciseDataConnectionStateChanged(state, networkType, apnType, apn, reason, + broadcastDataConnectionStateChanged(state, isDataAllowed, apn, apnType, linkProperties, + networkCapabilities, roaming, subId); + broadcastPreciseDataConnectionStateChanged(state, networkType, apnType, apn, linkProperties, ""); } - public void notifyDataConnectionFailed(String reason, String apnType) { + public void notifyDataConnectionFailed(String apnType) { notifyDataConnectionFailedForSubscriber(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, - reason, apnType); + apnType); } - public void notifyDataConnectionFailedForSubscriber(int subId, - String reason, String apnType) { + public void notifyDataConnectionFailedForSubscriber(int subId, String apnType) { if (!checkNotifyPermission("notifyDataConnectionFailed()")) { return; } if (VDBG) { log("notifyDataConnectionFailedForSubscriber: subId=" + subId - + " reason=" + reason + " apnType=" + apnType); + + " apnType=" + apnType); } synchronized (mRecords) { mPreciseDataConnectionState = new PreciseDataConnectionState( TelephonyManager.DATA_UNKNOWN,TelephonyManager.NETWORK_TYPE_UNKNOWN, - apnType, "", reason, null, ""); + apnType, "", null, ""); for (Record r : mRecords) { if (r.matchPhoneStateListenerEvent( PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE)) { @@ -1417,9 +1416,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } handleRemoveListLocked(); } - broadcastDataConnectionFailed(reason, apnType, subId); + broadcastDataConnectionFailed(apnType, subId); broadcastPreciseDataConnectionStateChanged(TelephonyManager.DATA_UNKNOWN, - TelephonyManager.NETWORK_TYPE_UNKNOWN, apnType, "", reason, null, ""); + TelephonyManager.NETWORK_TYPE_UNKNOWN, apnType, "", null, ""); } public void notifyCellLocation(Bundle cellLocation) { @@ -1529,15 +1528,14 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } } - public void notifyPreciseDataConnectionFailed(String reason, String apnType, - String apn, String failCause) { + public void notifyPreciseDataConnectionFailed(String apnType, String apn, String failCause) { if (!checkNotifyPermission("notifyPreciseDataConnectionFailed()")) { return; } synchronized (mRecords) { mPreciseDataConnectionState = new PreciseDataConnectionState( TelephonyManager.DATA_UNKNOWN, TelephonyManager.NETWORK_TYPE_UNKNOWN, - apnType, apn, reason, null, failCause); + apnType, apn, null, failCause); for (Record r : mRecords) { if (r.matchPhoneStateListenerEvent( PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE)) { @@ -1551,7 +1549,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { handleRemoveListLocked(); } broadcastPreciseDataConnectionStateChanged(TelephonyManager.DATA_UNKNOWN, - TelephonyManager.NETWORK_TYPE_UNKNOWN, apnType, apn, reason, null, failCause); + TelephonyManager.NETWORK_TYPE_UNKNOWN, apnType, apn, null, failCause); } @Override @@ -1881,10 +1879,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { android.Manifest.permission.READ_CALL_LOG}); } - private void broadcastDataConnectionStateChanged(int state, - boolean isDataAllowed, - String reason, String apn, String apnType, LinkProperties linkProperties, - NetworkCapabilities networkCapabilities, boolean roaming, int subId) { + private void broadcastDataConnectionStateChanged(int state, boolean isDataAllowed, String apn, + String apnType, LinkProperties linkProperties, + NetworkCapabilities networkCapabilities, + boolean roaming, int subId) { // Note: not reporting to the battery stats service here, because the // status bar takes care of that after taking into account all of the // required info. @@ -1894,9 +1892,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { if (!isDataAllowed) { intent.putExtra(PhoneConstants.NETWORK_UNAVAILABLE_KEY, true); } - if (reason != null) { - intent.putExtra(PhoneConstants.STATE_CHANGE_REASON_KEY, reason); - } if (linkProperties != null) { intent.putExtra(PhoneConstants.DATA_LINK_PROPERTIES_KEY, linkProperties); String iface = linkProperties.getInterfaceName(); @@ -1915,17 +1910,15 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); } - private void broadcastDataConnectionFailed(String reason, String apnType, - int subId) { + private void broadcastDataConnectionFailed(String apnType, int subId) { Intent intent = new Intent(TelephonyIntents.ACTION_DATA_CONNECTION_FAILED); - intent.putExtra(PhoneConstants.FAILURE_REASON_KEY, reason); intent.putExtra(PhoneConstants.DATA_APN_TYPE_KEY, apnType); intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); } private void broadcastPreciseCallStateChanged(int ringingCallState, int foregroundCallState, - int backgroundCallState) { + int backgroundCallState) { Intent intent = new Intent(TelephonyManager.ACTION_PRECISE_CALL_STATE_CHANGED); intent.putExtra(TelephonyManager.EXTRA_RINGING_CALL_STATE, ringingCallState); intent.putExtra(TelephonyManager.EXTRA_FOREGROUND_CALL_STATE, foregroundCallState); @@ -1935,16 +1928,16 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } private void broadcastPreciseDataConnectionStateChanged(int state, int networkType, - String apnType, String apn, String reason, LinkProperties linkProperties, - String failCause) { + String apnType, String apn, + LinkProperties linkProperties, + String failCause) { Intent intent = new Intent(TelephonyManager.ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED); intent.putExtra(PhoneConstants.STATE_KEY, state); intent.putExtra(PhoneConstants.DATA_NETWORK_TYPE_KEY, networkType); - if (reason != null) intent.putExtra(PhoneConstants.STATE_CHANGE_REASON_KEY, reason); if (apnType != null) intent.putExtra(PhoneConstants.DATA_APN_TYPE_KEY, apnType); if (apn != null) intent.putExtra(PhoneConstants.DATA_APN_KEY, apn); if (linkProperties != null) { - intent.putExtra(PhoneConstants.DATA_LINK_PROPERTIES_KEY,linkProperties); + intent.putExtra(PhoneConstants.DATA_LINK_PROPERTIES_KEY, linkProperties); } if (failCause != null) intent.putExtra(PhoneConstants.DATA_FAILURE_CAUSE_KEY, failCause); diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index a94fa12e4f35..ed39d8302bf7 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -2503,6 +2503,9 @@ public final class ActiveServices { && r.serviceInfo.packageName.equals(WebViewZygote.getPackageName())) { hostingType = "webview_service"; } + if ((r.serviceInfo.flags & ServiceInfo.FLAG_USE_APP_ZYGOTE) != 0) { + hostingType = "app_zygote"; + } } // Not running -- get it started, and enqueue this service record diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 16c236ef83ad..bc21610dd602 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -235,6 +235,7 @@ import android.media.audiofx.AudioEffect; import android.net.Proxy; import android.net.ProxyInfo; import android.net.Uri; +import android.os.AppZygote; import android.os.BatteryStats; import android.os.Binder; import android.os.BinderProxy; @@ -452,6 +453,9 @@ public class ActivityManagerService extends IActivityManager.Stub // before we decide it must be hung. static final int CONTENT_PROVIDER_PUBLISH_TIMEOUT = 10*1000; + // How long we wait to kill an application zygote, after the last process using + // it has gone away. + static final int KILL_APP_ZYGOTE_DELAY_MS = 5 * 1000; /** * How long we wait for an provider to be published. Should be longer than * {@link #CONTENT_PROVIDER_PUBLISH_TIMEOUT}. @@ -1441,6 +1445,7 @@ public class ActivityManagerService extends IActivityManager.Stub static final int PUSH_TEMP_WHITELIST_UI_MSG = 68; static final int SERVICE_FOREGROUND_CRASH_MSG = 69; static final int DISPATCH_OOM_ADJ_OBSERVER_MSG = 70; + static final int KILL_APP_ZYGOTE_MSG = 71; static final int FIRST_BROADCAST_QUEUE_MSG = 200; @@ -1644,6 +1649,12 @@ public class ActivityManagerService extends IActivityManager.Stub false, userId, reason); } } break; + case KILL_APP_ZYGOTE_MSG: { + synchronized (ActivityManagerService.this) { + final AppZygote appZygote = (AppZygote) msg.obj; + mProcessList.killAppZygoteIfNeededLocked(appZygote); + } + } break; case CHECK_EXCESSIVE_POWER_USE_MSG: { synchronized (ActivityManagerService.this) { checkExcessivePowerUsageLocked(); @@ -1932,7 +1943,8 @@ public class ActivityManagerService extends IActivityManager.Stub synchronized (this) { ProcessRecord app = mProcessList.newProcessRecordLocked(info, info.processName, false, - 0); + 0, + false); app.setPersistent(true); app.pid = MY_PID; app.getWindowProcessController().setPid(MY_PID); @@ -3744,10 +3756,10 @@ public class ActivityManagerService extends IActivityManager.Stub intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName); broadcastIntentInPackage("android", SYSTEM_UID, intent, null, null, 0, null, null, permission.ACCESS_INSTANT_APPS, null, false, false, - resolvedUserId); + resolvedUserId, false); } else { broadcastIntentInPackage("android", SYSTEM_UID, intent, null, null, 0, - null, null, null, null, false, false, resolvedUserId); + null, null, null, null, false, false, resolvedUserId, false); } if (observer != null) { @@ -7396,7 +7408,7 @@ public class ActivityManagerService extends IActivityManager.Stub } if (app == null) { - app = mProcessList.newProcessRecordLocked(info, customProcess, isolated, 0); + app = mProcessList.newProcessRecordLocked(info, customProcess, isolated, 0, false); mProcessList.updateLruProcessLocked(app, false, null); updateOomAdjLocked(); } @@ -13996,7 +14008,7 @@ public class ActivityManagerService extends IActivityManager.Stub BroadcastQueue queue = broadcastQueueForIntent(intent); BroadcastRecord r = new BroadcastRecord(queue, intent, null, null, -1, -1, false, null, null, OP_NONE, null, receivers, - null, 0, null, null, false, true, true, -1); + null, 0, null, null, false, true, true, -1, false); queue.enqueueParallelBroadcastLocked(r); queue.scheduleBroadcastsLocked(); } @@ -14235,6 +14247,18 @@ public class ActivityManagerService extends IActivityManager.Stub IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras, String[] requiredPermissions, int appOp, Bundle bOptions, boolean ordered, boolean sticky, int callingPid, int callingUid, int userId) { + return broadcastIntentLocked(callerApp, callerPackage, intent, resolvedType, resultTo, + resultCode, resultData, resultExtras, requiredPermissions, appOp, bOptions, ordered, + sticky, callingPid, callingUid, userId, false /* allowBackgroundActivityStarts */); + } + + @GuardedBy("this") + final int broadcastIntentLocked(ProcessRecord callerApp, + String callerPackage, Intent intent, String resolvedType, + IIntentReceiver resultTo, int resultCode, String resultData, + Bundle resultExtras, String[] requiredPermissions, int appOp, Bundle bOptions, + boolean ordered, boolean sticky, int callingPid, int callingUid, int userId, + boolean allowBackgroundActivityStarts) { intent = new Intent(intent); final boolean callerInstantApp = isInstantApp(callerApp, callerPackage, callingUid); @@ -14735,7 +14759,8 @@ public class ActivityManagerService extends IActivityManager.Stub BroadcastRecord r = new BroadcastRecord(queue, intent, callerApp, callerPackage, callingPid, callingUid, callerInstantApp, resolvedType, requiredPermissions, appOp, brOptions, registeredReceivers, resultTo, - resultCode, resultData, resultExtras, ordered, sticky, false, userId); + resultCode, resultData, resultExtras, ordered, sticky, false, userId, + allowBackgroundActivityStarts); if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "Enqueueing parallel broadcast " + r); final boolean replaced = replacePending && (queue.replaceParallelBroadcastLocked(r) != null); @@ -14831,7 +14856,8 @@ public class ActivityManagerService extends IActivityManager.Stub BroadcastRecord r = new BroadcastRecord(queue, intent, callerApp, callerPackage, callingPid, callingUid, callerInstantApp, resolvedType, requiredPermissions, appOp, brOptions, receivers, resultTo, resultCode, - resultData, resultExtras, ordered, sticky, false, userId); + resultData, resultExtras, ordered, sticky, false, userId, + allowBackgroundActivityStarts); if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "Enqueueing ordered broadcast " + r + ": prev had " + queue.mOrderedBroadcasts.size()); @@ -14978,7 +15004,7 @@ public class ActivityManagerService extends IActivityManager.Stub Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras, String requiredPermission, Bundle bOptions, boolean serialized, boolean sticky, - int userId) { + int userId, boolean allowBackgroundActivityStarts) { synchronized(this) { intent = verifyBroadcastLocked(intent); @@ -14988,7 +15014,7 @@ public class ActivityManagerService extends IActivityManager.Stub int res = broadcastIntentLocked(null, packageName, intent, resolvedType, resultTo, resultCode, resultData, resultExtras, requiredPermissions, OP_NONE, bOptions, serialized, - sticky, -1, uid, userId); + sticky, -1, uid, userId, allowBackgroundActivityStarts); Binder.restoreCallingIdentity(origId); return res; } @@ -19044,6 +19070,19 @@ public class ActivityManagerService extends IActivityManager.Stub } @Override + public void setPendingIntentAllowBgActivityStarts(IIntentSender target, + IBinder whitelistToken, int flags) { + if (!(target instanceof PendingIntentRecord)) { + Slog.w(TAG, "setPendingIntentAllowBgActivityStarts():" + + " not a PendingIntentRecord: " + target); + return; + } + synchronized (ActivityManagerService.this) { + ((PendingIntentRecord) target).setAllowBgActivityStarts(whitelistToken, flags); + } + } + + @Override public void setDeviceIdleWhitelist(int[] allAppids, int[] exceptIdleAppids) { synchronized (ActivityManagerService.this) { mDeviceIdleWhitelist = allAppids; @@ -19430,11 +19469,12 @@ public class ActivityManagerService extends IActivityManager.Stub public int broadcastIntentInPackage(String packageName, int uid, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras, String requiredPermission, Bundle bOptions, boolean serialized, - boolean sticky, int userId) { + boolean sticky, int userId, boolean allowBackgroundActivityStarts) { synchronized (ActivityManagerService.this) { return ActivityManagerService.this.broadcastIntentInPackage(packageName, uid, intent, resolvedType, resultTo, resultCode, resultData, resultExtras, - requiredPermission, bOptions, serialized, sticky, userId); + requiredPermission, bOptions, serialized, sticky, userId, + allowBackgroundActivityStarts); } } diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index c290fbe09864..65aacdcb73e0 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -287,6 +287,9 @@ public final class BroadcastQueue { r.curApp = app; app.curReceivers.add(r); app.forceProcessStateUpTo(ActivityManager.PROCESS_STATE_RECEIVER); + if (r.allowBackgroundActivityStarts) { + app.addAllowBackgroundActivityStartsToken(r); + } mService.mProcessList.updateLruProcessLocked(app, false, null); if (!skipOomAdj) { mService.updateOomAdjLocked(); @@ -415,6 +418,9 @@ public final class BroadcastQueue { if (state == BroadcastRecord.IDLE) { Slog.w(TAG, "finishReceiver [" + mQueueName + "] called but state is IDLE"); } + if (r.allowBackgroundActivityStarts) { + r.curApp.removeAllowBackgroundActivityStartsToken(r); + } // If we're abandoning this broadcast before any receivers were actually spun up, // nextReceiver is zero; in which case time-to-process bookkeeping doesn't apply. if (r.nextReceiver > 0) { diff --git a/services/core/java/com/android/server/am/BroadcastRecord.java b/services/core/java/com/android/server/am/BroadcastRecord.java index 9b7dc44e5a73..9e799f6f14f3 100644 --- a/services/core/java/com/android/server/am/BroadcastRecord.java +++ b/services/core/java/com/android/server/am/BroadcastRecord.java @@ -81,6 +81,10 @@ final class BroadcastRecord extends Binder { int manifestSkipCount; // number of manifest receivers skipped. BroadcastQueue queue; // the outbound queue handling this broadcast + // if set to true, app's process will be temporarily whitelisted to start activities + // from background for the duration of the broadcast dispatch + final boolean allowBackgroundActivityStarts; + static final int IDLE = 0; static final int APP_RECEIVE = 1; static final int CALL_IN_RECEIVE = 2; @@ -223,7 +227,8 @@ final class BroadcastRecord extends Binder { int _callingPid, int _callingUid, boolean _callerInstantApp, String _resolvedType, String[] _requiredPermissions, int _appOp, BroadcastOptions _options, List _receivers, IIntentReceiver _resultTo, int _resultCode, String _resultData, Bundle _resultExtras, - boolean _serialized, boolean _sticky, boolean _initialSticky, int _userId) { + boolean _serialized, boolean _sticky, boolean _initialSticky, int _userId, + boolean _allowBackgroundActivityStarts) { if (_intent == null) { throw new NullPointerException("Can't construct with a null intent"); } @@ -252,6 +257,7 @@ final class BroadcastRecord extends Binder { userId = _userId; nextReceiver = 0; state = IDLE; + allowBackgroundActivityStarts = _allowBackgroundActivityStarts; } /** @@ -295,6 +301,7 @@ final class BroadcastRecord extends Binder { manifestCount = from.manifestCount; manifestSkipCount = from.manifestSkipCount; queue = from.queue; + allowBackgroundActivityStarts = from.allowBackgroundActivityStarts; } public BroadcastRecord maybeStripForHistory() { diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index 65cd329b5de8..f9a77af631af 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -67,8 +67,8 @@ final class CoreSettingsObserver extends ContentObserver { sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYERS_GLES, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYER_APP, String.class); sGlobalSettingToTypeMap.put(Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, int.class); - sGlobalSettingToTypeMap.put(Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, - String.class); + sGlobalSettingToTypeMap.put(Settings.Global.GUP_DEV_OPT_IN_APPS, String.class); + sGlobalSettingToTypeMap.put(Settings.Global.GUP_BLACK_LIST, String.class); // add other global settings here... } diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java index 447243b542ea..b675d9d4f9cf 100644 --- a/services/core/java/com/android/server/am/PendingIntentRecord.java +++ b/services/core/java/com/android/server/am/PendingIntentRecord.java @@ -34,6 +34,7 @@ import android.os.RemoteException; import android.os.TransactionTooLargeException; import android.os.UserHandle; import android.util.ArrayMap; +import android.util.ArraySet; import android.util.Slog; import android.util.TimeUtils; @@ -48,6 +49,9 @@ import java.util.Objects; public final class PendingIntentRecord extends IIntentSender.Stub { private static final String TAG = TAG_WITH_CLASS_NAME ? "PendingIntentRecord" : TAG_AM; + public static final int FLAG_ACTIVITY_SENDER = 1 << 0; + public static final int FLAG_BROADCAST_SENDER = 1 << 1; + final PendingIntentController controller; final Key key; final int uid; @@ -56,6 +60,8 @@ public final class PendingIntentRecord extends IIntentSender.Stub { boolean canceled = false; private ArrayMap<IBinder, Long> whitelistDuration; private RemoteCallbackList<IResultReceiver> mCancelCallbacks; + private ArraySet<IBinder> mAllowBgActivityStartsForActivitySender = new ArraySet<>(); + private ArraySet<IBinder> mAllowBgActivityStartsForBroadcastSender = new ArraySet<>(); String stringName; String lastTagPrefix; @@ -214,6 +220,16 @@ public final class PendingIntentRecord extends IIntentSender.Stub { this.stringName = null; } + void setAllowBgActivityStarts(IBinder token, int flags) { + if (token == null) return; + if ((flags & FLAG_ACTIVITY_SENDER) != 0) { + mAllowBgActivityStartsForActivitySender.add(token); + } + if ((flags & FLAG_BROADCAST_SENDER) != 0) { + mAllowBgActivityStartsForBroadcastSender.add(token); + } + } + public void registerCancelListenerLocked(IResultReceiver receiver) { if (mCancelCallbacks == null) { mCancelCallbacks = new RemoteCallbackList<>(); @@ -370,14 +386,16 @@ public final class PendingIntentRecord extends IIntentSender.Stub { res = controller.mAtmInternal.startActivitiesInPackage( uid, key.packageName, allIntents, allResolvedTypes, resultTo, mergedOptions, userId, false /* validateIncomingUser */, - this /* originatingPendingIntent */); + this /* originatingPendingIntent */, + mAllowBgActivityStartsForActivitySender.contains(whitelistToken)); } else { res = controller.mAtmInternal.startActivityInPackage( uid, callingPid, callingUid, key.packageName, finalIntent, resolvedType, resultTo, resultWho, requestCode, 0, mergedOptions, userId, null, "PendingIntentRecord", false /* validateIncomingUser */, - this /* originatingPendingIntent */); + this /* originatingPendingIntent */, + mAllowBgActivityStartsForActivitySender.contains(whitelistToken)); } } catch (RuntimeException e) { Slog.w(TAG, "Unable to send startActivity intent", e); @@ -394,7 +412,8 @@ public final class PendingIntentRecord extends IIntentSender.Stub { int sent = controller.mAmInternal.broadcastIntentInPackage(key.packageName, uid, finalIntent, resolvedType, finishedReceiver, code, null, null, requiredPermission, options, (finishedReceiver != null), - false, userId); + false, userId, + mAllowBgActivityStartsForBroadcastSender.contains(whitelistToken)); if (sent == ActivityManager.BROADCAST_SUCCESS) { sendFinish = false; } diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index d133deaf4b8e..9898d06837be 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -19,8 +19,6 @@ package com.android.server.am; import static android.app.ActivityManager.PROCESS_STATE_CACHED_ACTIVITY; import static android.app.ActivityThread.PROC_START_SEQ_IDENT; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AUTO; -import static android.os.Process.FIRST_ISOLATED_UID; -import static android.os.Process.LAST_ISOLATED_UID; import static android.os.Process.SYSTEM_UID; import static android.os.Process.THREAD_PRIORITY_BACKGROUND; import static android.os.Process.getFreeMemory; @@ -34,6 +32,8 @@ import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PSS; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_UID_OBSERVERS; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; +import static com.android.server.am.ActivityManagerService.KILL_APP_ZYGOTE_DELAY_MS; +import static com.android.server.am.ActivityManagerService.KILL_APP_ZYGOTE_MSG; import static com.android.server.am.ActivityManagerService.PERSISTENT_MASK; import static com.android.server.am.ActivityManagerService.PROC_START_TIMEOUT; import static com.android.server.am.ActivityManagerService.PROC_START_TIMEOUT_MSG; @@ -58,6 +58,7 @@ import android.graphics.Point; import android.net.LocalSocket; import android.net.LocalSocketAddress; import android.net.Uri; +import android.os.AppZygote; import android.os.Binder; import android.os.Build; import android.os.Bundle; @@ -75,10 +76,12 @@ import android.os.UserHandle; import android.os.storage.StorageManager; import android.os.storage.StorageManagerInternal; import android.text.TextUtils; +import android.util.ArrayMap; import android.util.EventLog; import android.util.LongSparseArray; import android.util.Slog; import android.util.SparseArray; +import android.util.SparseBooleanArray; import android.util.StatsLog; import android.view.Display; @@ -108,6 +111,7 @@ import java.io.PrintWriter; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; +import java.util.BitSet; import java.util.List; /** @@ -354,10 +358,136 @@ public final class ProcessList { final SparseArray<ProcessRecord> mIsolatedProcesses = new SparseArray<>(); /** - * Counter for assigning isolated process uids, to avoid frequently reusing the - * same ones. + * The currently running application zygotes. */ - int mNextIsolatedProcessUid = 0; + final ProcessMap<AppZygote> mAppZygotes = new ProcessMap<AppZygote>(); + + /** + * The processes that are forked off an application zygote. + */ + final ArrayMap<AppZygote, ArrayList<ProcessRecord>> mAppZygoteProcesses = + new ArrayMap<AppZygote, ArrayList<ProcessRecord>>(); + + final class IsolatedUidRange { + @VisibleForTesting + public final int mFirstUid; + @VisibleForTesting + public final int mLastUid; + + @GuardedBy("ProcessList.this.mService") + private final SparseBooleanArray mUidUsed = new SparseBooleanArray(); + + @GuardedBy("ProcessList.this.mService") + private int mNextUid; + + IsolatedUidRange(int firstUid, int lastUid) { + mFirstUid = firstUid; + mLastUid = lastUid; + mNextUid = firstUid; + } + + @GuardedBy("ProcessList.this.mService") + int allocateIsolatedUidLocked(int userId) { + int uid; + int stepsLeft = (mLastUid - mFirstUid + 1); + for (int i = 0; i < stepsLeft; ++i) { + if (mNextUid < mFirstUid || mNextUid > mLastUid) { + mNextUid = mFirstUid; + } + uid = UserHandle.getUid(userId, mNextUid); + mNextUid++; + if (!mUidUsed.get(uid, false)) { + mUidUsed.put(uid, true); + return uid; + } + } + return -1; + } + + @GuardedBy("ProcessList.this.mService") + void freeIsolatedUidLocked(int uid) { + // Strip out userId + final int appId = UserHandle.getAppId(uid); + mUidUsed.delete(appId); + } + }; + + /** + * A class that allocates ranges of isolated UIDs per application, and keeps track of them. + */ + final class IsolatedUidRangeAllocator { + private final int mFirstUid; + private final int mNumUidRanges; + private final int mNumUidsPerRange; + /** + * We map the uid range [mFirstUid, mFirstUid + mNumUidRanges * mNumUidsPerRange) + * back to an underlying bitset of [0, mNumUidRanges) and allocate out of that. + */ + @GuardedBy("ProcessList.this.mService") + private final BitSet mAvailableUidRanges; + @GuardedBy("ProcessList.this.mService") + private final ProcessMap<IsolatedUidRange> mAppRanges = new ProcessMap<IsolatedUidRange>(); + + IsolatedUidRangeAllocator(int firstUid, int lastUid, int numUidsPerRange) { + mFirstUid = firstUid; + mNumUidsPerRange = numUidsPerRange; + mNumUidRanges = (lastUid - firstUid + 1) / numUidsPerRange; + mAvailableUidRanges = new BitSet(mNumUidRanges); + // Mark all as available + mAvailableUidRanges.set(0, mNumUidRanges); + } + + @GuardedBy("ProcessList.this.mService") + IsolatedUidRange getIsolatedUidRangeLocked(ApplicationInfo info) { + return mAppRanges.get(info.processName, info.uid); + } + + @GuardedBy("ProcessList.this.mService") + IsolatedUidRange getOrCreateIsolatedUidRangeLocked(ApplicationInfo info) { + IsolatedUidRange range = getIsolatedUidRangeLocked(info); + if (range == null) { + int uidRangeIndex = mAvailableUidRanges.nextSetBit(0); + if (uidRangeIndex < 0) { + // No free range + return null; + } + mAvailableUidRanges.clear(uidRangeIndex); + int actualUid = mFirstUid + uidRangeIndex * mNumUidsPerRange; + range = new IsolatedUidRange(actualUid, actualUid + mNumUidsPerRange - 1); + mAppRanges.put(info.processName, info.uid, range); + } + return range; + } + + @GuardedBy("ProcessList.this.mService") + void freeUidRangeLocked(ApplicationInfo info) { + // Find the UID range + IsolatedUidRange range = mAppRanges.get(info.processName, info.uid); + if (range != null) { + // Map back to starting uid + final int uidRangeIndex = (range.mFirstUid - mFirstUid) / mNumUidsPerRange; + // Mark it as available in the underlying bitset + mAvailableUidRanges.set(uidRangeIndex); + // And the map + mAppRanges.remove(info.processName, info.uid); + } + } + } + + /** + * The available isolated UIDs for processes that are not spawned from an application zygote. + */ + @VisibleForTesting + IsolatedUidRange mGlobalIsolatedUids = new IsolatedUidRange(Process.FIRST_ISOLATED_UID, + Process.LAST_ISOLATED_UID); + + /** + * An allocator for isolated UID ranges for apps that use an application zygote. + */ + @VisibleForTesting + IsolatedUidRangeAllocator mAppIsolatedUidRangeAllocator = + new IsolatedUidRangeAllocator(Process.FIRST_APP_ZYGOTE_ISOLATED_UID, + Process.LAST_APP_ZYGOTE_ISOLATED_UID, Process.NUM_UIDS_PER_APP_ZYGOTE); /** * Processes that are being forcibly torn down. @@ -1505,6 +1635,67 @@ public final class ProcessList { } } + @GuardedBy("mService") + public void killAppZygoteIfNeededLocked(AppZygote appZygote) { + final ApplicationInfo appInfo = appZygote.getAppInfo(); + ArrayList<ProcessRecord> zygoteProcesses = mAppZygoteProcesses.get(appZygote); + if (zygoteProcesses.size() == 0) { // Only remove if no longer in use now + mAppZygotes.remove(appInfo.processName, appInfo.uid); + mAppZygoteProcesses.remove(appZygote); + mAppIsolatedUidRangeAllocator.freeUidRangeLocked(appInfo); + appZygote.stopZygote(); + } + } + + @GuardedBy("mService") + private void removeProcessFromAppZygoteLocked(final ProcessRecord app) { + // Free the isolated uid for this process + final IsolatedUidRange appUidRange = + mAppIsolatedUidRangeAllocator.getIsolatedUidRangeLocked(app.info); + if (appUidRange != null) { + appUidRange.freeIsolatedUidLocked(app.uid); + } + + final AppZygote appZygote = mAppZygotes.get(app.info.processName, app.info.uid); + if (appZygote != null) { + ArrayList<ProcessRecord> zygoteProcesses = mAppZygoteProcesses.get(appZygote); + zygoteProcesses.remove(app); + if (zygoteProcesses.size() == 0) { + Message msg = mService.mHandler.obtainMessage(KILL_APP_ZYGOTE_MSG); + msg.obj = appZygote; + mService.mHandler.sendMessageDelayed(msg, KILL_APP_ZYGOTE_DELAY_MS); + } + } + } + + private AppZygote createAppZygoteForProcessIfNeeded(final ProcessRecord app) { + synchronized (mService) { + AppZygote appZygote = mAppZygotes.get(app.info.processName, app.info.uid); + final ArrayList<ProcessRecord> zygoteProcessList; + if (appZygote == null) { + final int userId = UserHandle.getUserId(app.info.uid); + final IsolatedUidRange uidRange = + mAppIsolatedUidRangeAllocator.getIsolatedUidRangeLocked(app.info); + // Allocate an isolated UID out of this range for the Zygote itself + final int zygoteIsolatedUid = uidRange.allocateIsolatedUidLocked(userId); + appZygote = new AppZygote(app.info, zygoteIsolatedUid); + mAppZygotes.put(app.info.processName, app.info.uid, appZygote); + zygoteProcessList = new ArrayList<ProcessRecord>(); + mAppZygoteProcesses.put(appZygote, zygoteProcessList); + } else { + mService.mHandler.removeMessages(KILL_APP_ZYGOTE_MSG, appZygote); + zygoteProcessList = mAppZygoteProcesses.get(appZygote); + } + // Note that we already add the app to mAppZygoteProcesses here; + // this is so that another thread can't come in and kill the zygote + // before we've even tried to start the process. If the process launch + // goes wrong, we'll clean this up in removeProcessNameLocked() + zygoteProcessList.add(app); + + return appZygote; + } + } + private Process.ProcessStartResult startProcess(String hostingType, String entryPoint, ProcessRecord app, int uid, int[] gids, int runtimeFlags, int mountExternal, String seInfo, String requiredAbi, String instructionSet, String invokeWith, @@ -1525,6 +1716,15 @@ public final class ProcessList { app.info.dataDir, null, app.info.packageName, packageNames, visibleVolIds, new String[] {PROC_START_SEQ_IDENT + app.startSeq}); + } else if (hostingType.equals("app_zygote")) { + final AppZygote appZygote = createAppZygoteForProcessIfNeeded(app); + + startResult = appZygote.getProcess().start(entryPoint, + app.processName, uid, uid, gids, runtimeFlags, mountExternal, + app.info.targetSdkVersion, seInfo, requiredAbi, instructionSet, + app.info.dataDir, null, app.info.packageName, + packageNames, visibleVolIds, + new String[] {PROC_START_SEQ_IDENT + app.startSeq}); } else { startResult = Process.start(entryPoint, app.processName, uid, uid, gids, runtimeFlags, mountExternal, @@ -1614,13 +1814,6 @@ public final class ProcessList { app.addPackage(info.packageName, info.versionCode, mService.mProcessStats); checkSlow(startTime, "startProcess: done, added package to proc"); return app; - } else if (app.getActiveInstrumentation() != null) { - // We don't want to kill running instrumentation. - if (DEBUG_PROCESSES) { - Slog.v(TAG_PROCESSES, "Instrumentation already running: " + app); - } - checkSlow(startTime, "startProcess: keep instrumentation proc"); - return app; } // An application record is attached to a previous process, @@ -1636,8 +1829,9 @@ public final class ProcessList { ? hostingName.flattenToShortString() : null; if (app == null) { + final boolean fromAppZygote = "app_zygote".equals(hostingType); checkSlow(startTime, "startProcess: creating new process record"); - app = newProcessRecordLocked(info, processName, isolated, isolatedUid); + app = newProcessRecordLocked(info, processName, isolated, isolatedUid, fromAppZygote); if (app == null) { Slog.w(TAG, "Failed making new process record for " + processName + "/" + info.uid + " isolated=" + isolated); @@ -2010,29 +2204,31 @@ public final class ProcessList { } @GuardedBy("mService") + private IsolatedUidRange getOrCreateIsolatedUidRangeLocked(ApplicationInfo info, + boolean fromAppZygote) { + if (!fromAppZygote) { + // Allocate an isolated UID from the global range + return mGlobalIsolatedUids; + } else { + return mAppIsolatedUidRangeAllocator.getOrCreateIsolatedUidRangeLocked(info); + } + } + + @GuardedBy("mService") final ProcessRecord newProcessRecordLocked(ApplicationInfo info, String customProcess, - boolean isolated, int isolatedUid) { + boolean isolated, int isolatedUid, boolean fromAppZygote) { String proc = customProcess != null ? customProcess : info.processName; final int userId = UserHandle.getUserId(info.uid); int uid = info.uid; if (isolated) { if (isolatedUid == 0) { - int stepsLeft = LAST_ISOLATED_UID - FIRST_ISOLATED_UID + 1; - while (true) { - if (mNextIsolatedProcessUid < FIRST_ISOLATED_UID - || mNextIsolatedProcessUid > LAST_ISOLATED_UID) { - mNextIsolatedProcessUid = FIRST_ISOLATED_UID; - } - uid = UserHandle.getUid(userId, mNextIsolatedProcessUid); - mNextIsolatedProcessUid++; - if (mIsolatedProcesses.indexOfKey(uid) < 0) { - // No process for this uid, use it. - break; - } - stepsLeft--; - if (stepsLeft <= 0) { - return null; - } + IsolatedUidRange uidRange = getOrCreateIsolatedUidRangeLocked(info, fromAppZygote); + if (uidRange == null) { + return null; + } + uid = uidRange.allocateIsolatedUidLocked(userId); + if (uid == -1) { + return null; } } else { // Special case for startIsolatedProcess (internal only), where @@ -2100,6 +2296,13 @@ public final class ProcessList { old.uidRecord = null; } mIsolatedProcesses.remove(uid); + mGlobalIsolatedUids.freeIsolatedUidLocked(uid); + // Remove the (expected) ProcessRecord from the app zygote + final ProcessRecord record = expecting != null ? expecting : old; + if (record != null && record.appZygote) { + removeProcessFromAppZygoteLocked(record); + } + return old; } diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index c15b7c7d82c2..0d0824a74cdd 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -76,6 +76,7 @@ final class ProcessRecord implements WindowProcessListener { private final ActivityManagerService mService; // where we came from final ApplicationInfo info; // all about the first app in the process final boolean isolated; // true if this is a special isolated process + final boolean appZygote; // true if this is forked from the app zygote final int uid; // uid of process; may be different from 'info' if isolated final int userId; // user of process. final String processName; // name of the process @@ -249,6 +250,9 @@ final class ProcessRecord implements WindowProcessListener { final ArrayMap<String, ContentProviderRecord> pubProviders = new ArrayMap<>(); // All ContentProviderRecord process is using final ArrayList<ContentProviderConnection> conProviders = new ArrayList<>(); + // A set of tokens that currently contribute to this process being temporarily whitelisted + // to start activities even if it's not in the foreground + final ArraySet<Binder> mAllowBackgroundActivityStartsTokens = new ArraySet<>(); String isolatedEntryPoint; // Class to run on start if this is a special isolated process. String[] isolatedEntryPointArgs; // Arguments to pass to isolatedEntryPoint's main(). @@ -556,6 +560,8 @@ final class ProcessRecord implements WindowProcessListener { mService = _service; info = _info; isolated = _info.uid != _uid; + appZygote = (UserHandle.getAppId(_uid) >= Process.FIRST_APP_ZYGOTE_ISOLATED_UID + && UserHandle.getAppId(_uid) <= Process.LAST_APP_ZYGOTE_ISOLATED_UID); uid = _uid; userId = UserHandle.getUserId(_uid); processName = _processName; @@ -1135,6 +1141,17 @@ final class ProcessRecord implements WindowProcessListener { return mUsingWrapper; } + void addAllowBackgroundActivityStartsToken(Binder entity) { + mAllowBackgroundActivityStartsTokens.add(entity); + mWindowProcessController.setAllowBackgroundActivityStarts(true); + } + + void removeAllowBackgroundActivityStartsToken(Binder entity) { + mAllowBackgroundActivityStartsTokens.remove(entity); + mWindowProcessController.setAllowBackgroundActivityStarts( + !mAllowBackgroundActivityStartsTokens.isEmpty()); + } + void setActiveInstrumentation(ActiveInstrumentation instr) { mInstr = instr; mWindowProcessController.setInstrumenting(instr != null); diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java index a381477b01cb..36ca4dcbea33 100644 --- a/services/core/java/com/android/server/biometrics/BiometricService.java +++ b/services/core/java/com/android/server/biometrics/BiometricService.java @@ -373,6 +373,13 @@ public class BiometricService extends SystemService { public void onAuthenticationSucceeded(boolean requireConfirmation, byte[] token) throws RemoteException { try { + // Should never happen, log this to catch bad HAL behavior (e.g. auth succeeded + // after user dismissed/canceled dialog). + if (mCurrentAuthSession == null) { + Slog.e(TAG, "onAuthenticationSucceeded(): Auth session is null"); + return; + } + if (!requireConfirmation) { mActivityTaskManager.unregisterTaskStackListener(mTaskStackListener); KeyStore.getInstance().addAuthToken(token); @@ -398,6 +405,13 @@ public class BiometricService extends SystemService { public void onAuthenticationFailed(int cookie, boolean requireConfirmation) throws RemoteException { try { + // Should never happen, log this to catch bad HAL behavior (e.g. auth succeeded + // after user dismissed/canceled dialog). + if (mCurrentAuthSession == null) { + Slog.e(TAG, "onAuthenticationFailed(): Auth session is null"); + return; + } + mStatusBarService.onBiometricHelp(getContext().getResources().getString( com.android.internal.R.string.biometric_not_recognized)); if (requireConfirmation) { @@ -486,6 +500,13 @@ public class BiometricService extends SystemService { @Override public void onAcquired(int acquiredInfo, String message) throws RemoteException { + // Should never happen, log this to catch bad HAL behavior (e.g. auth succeeded + // after user dismissed/canceled dialog). + if (mCurrentAuthSession == null) { + Slog.e(TAG, "onAcquired(): Auth session is null"); + return; + } + if (acquiredInfo != BiometricConstants.BIOMETRIC_ACQUIRED_GOOD) { try { mStatusBarService.onBiometricHelp(message); diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 52ecccaa7367..78b3c15500ea 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -17,13 +17,6 @@ package com.android.server.display; import android.annotation.Nullable; -import android.app.ActivityManager; -import android.app.ActivityManager.StackInfo; -import android.app.ActivityTaskManager; -import android.app.IActivityTaskManager; -import android.app.TaskStackListener; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManagerInternal; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; @@ -34,8 +27,6 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.PowerManager; -import android.os.Process; -import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; import android.util.EventLog; @@ -43,15 +34,14 @@ import android.util.MathUtils; import android.util.Slog; import android.util.TimeUtils; -import com.android.internal.os.BackgroundThread; import com.android.server.EventLogTags; -import com.android.server.LocalServices; import java.io.PrintWriter; class AutomaticBrightnessController { private static final String TAG = "AutomaticBrightnessController"; + private static final boolean DEBUG = false; private static final boolean DEBUG_PRETEND_LIGHT_SENSOR_ABSENT = false; // If true, enables the use of the screen auto-brightness adjustment setting. @@ -76,8 +66,6 @@ class AutomaticBrightnessController { private static final int MSG_UPDATE_AMBIENT_LUX = 1; private static final int MSG_BRIGHTNESS_ADJUSTMENT_SAMPLE = 2; private static final int MSG_INVALIDATE_SHORT_TERM_MODEL = 3; - private static final int MSG_UPDATE_FOREGROUND_APP = 4; - private static final int MSG_UPDATE_FOREGROUND_APP_SYNC = 5; // Length of the ambient light horizon used to calculate the long term estimate of ambient // light. @@ -138,8 +126,6 @@ class AutomaticBrightnessController { private final HysteresisLevels mAmbientBrightnessThresholds; private final HysteresisLevels mScreenBrightnessThresholds; - private boolean mLoggingEnabled; - // Amount of time to delay auto-brightness after screen on while waiting for // the light sensor to warm-up in milliseconds. // May be 0 if no warm-up is required. @@ -206,19 +192,6 @@ class AutomaticBrightnessController { private float mShortTermModelAnchor; private float SHORT_TERM_MODEL_THRESHOLD_RATIO = 0.6f; - // Context-sensitive brightness configurations require keeping track of the foreground app's - // package name and category, which is done by registering a TaskStackListener to call back to - // us onTaskStackChanged, and then using the ActivityTaskManager to get the foreground app's - // package namd and PackageManager to get its category (so might as well cache them). - private int mUserId; - private String mForegroundAppPackageName; - private String mPendingForegroundAppPackageName; - private @ApplicationInfo.Category int mForegroundAppCategory; - private @ApplicationInfo.Category int mPendingForegroundAppCategory; - private TaskStackListenerImpl mTaskStackListener; - private IActivityTaskManager mActivityTaskManager; - private PackageManagerInternal mPackageManagerInternal; - public AutomaticBrightnessController(Callbacks callbacks, Looper looper, SensorManager sensorManager, BrightnessMappingStrategy mapper, int lightSensorWarmUpTime, int brightnessMin, int brightnessMax, float dozeScaleFactor, @@ -253,42 +226,6 @@ class AutomaticBrightnessController { if (!DEBUG_PRETEND_LIGHT_SENSOR_ABSENT) { mLightSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT); } - - mUserId = ActivityManager.getCurrentUser(); - mActivityTaskManager = ActivityTaskManager.getService(); - mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class); - mTaskStackListener = new TaskStackListenerImpl(); - mForegroundAppPackageName = null; - mPendingForegroundAppPackageName = null; - mForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; - mPendingForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; - } - - /** - * Enable/disable logging. - * - * @param loggingEnabled - * Whether logging should be on/off. - * - * @return Whether the method succeeded or not. - */ - public boolean setLoggingEnabled(boolean loggingEnabled) { - if (mLoggingEnabled == loggingEnabled) { - return false; - } - mBrightnessMapper.setLoggingEnabled(loggingEnabled); - mLoggingEnabled = loggingEnabled; - return true; - } - - /** - * Update the current user's ID. - * - * @param userId - * The current user's ID. - */ - public void onSwitchUser(int userId) { - mUserId = userId; } public int getAutomaticScreenBrightness() { @@ -353,7 +290,7 @@ class AutomaticBrightnessController { } final int oldPolicy = mDisplayPolicy; mDisplayPolicy = policy; - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "Display policy transitioning from " + oldPolicy + " to " + policy); } if (!isInteractivePolicy(policy) && isInteractivePolicy(oldPolicy)) { @@ -380,7 +317,7 @@ class AutomaticBrightnessController { mBrightnessMapper.addUserDataPoint(mAmbientLux, brightness); mShortTermModelValid = true; mShortTermModelAnchor = mAmbientLux; - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "ShortTermModel: anchor=" + mShortTermModelAnchor); } return true; @@ -393,7 +330,7 @@ class AutomaticBrightnessController { } private void invalidateShortTermModel() { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "ShortTermModel: invalidate user data"); } mShortTermModelValid = false; @@ -446,11 +383,7 @@ class AutomaticBrightnessController { pw.println(" mBrightnessAdjustmentSampleOldLux=" + mBrightnessAdjustmentSampleOldLux); pw.println(" mBrightnessAdjustmentSampleOldBrightness=" + mBrightnessAdjustmentSampleOldBrightness); - pw.println(" mUserId=" + mUserId); - pw.println(" mForegroundAppPackageName=" + mForegroundAppPackageName); - pw.println(" mPendingForegroundAppPackageName=" + mPendingForegroundAppPackageName); - pw.println(" mForegroundAppCategory=" + mForegroundAppCategory); - pw.println(" mPendingForegroundAppCategory=" + mPendingForegroundAppCategory); + pw.println(" mShortTermModelValid=" + mShortTermModelValid); pw.println(); mBrightnessMapper.dump(pw); @@ -466,7 +399,6 @@ class AutomaticBrightnessController { mLightSensorEnabled = true; mLightSensorEnableTime = SystemClock.uptimeMillis(); mCurrentLightSensorRate = mInitialLightSensorRate; - registerForegroundAppUpdater(); mSensorManager.registerListener(mLightSensorListener, mLightSensor, mCurrentLightSensorRate * 1000, mHandler); return true; @@ -479,7 +411,6 @@ class AutomaticBrightnessController { mAmbientLightRingBuffer.clear(); mCurrentLightSensorRate = -1; mHandler.removeMessages(MSG_UPDATE_AMBIENT_LUX); - unregisterForegroundAppUpdater(); mSensorManager.unregisterListener(mLightSensorListener); } return false; @@ -510,7 +441,7 @@ class AutomaticBrightnessController { private void adjustLightSensorRate(int lightSensorRate) { // if the light sensor rate changed, update the sensor listener if (lightSensorRate != mCurrentLightSensorRate) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "adjustLightSensorRate: " + "previousRate=" + mCurrentLightSensorRate + ", " + "currentRate=" + lightSensorRate); @@ -527,7 +458,7 @@ class AutomaticBrightnessController { } private void setAmbientLux(float lux) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "setAmbientLux(" + lux + ")"); } if (lux < 0) { @@ -545,7 +476,7 @@ class AutomaticBrightnessController { final float maxAmbientLux = mShortTermModelAnchor + mShortTermModelAnchor * SHORT_TERM_MODEL_THRESHOLD_RATIO; if (minAmbientLux < mAmbientLux && mAmbientLux < maxAmbientLux) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "ShortTermModel: re-validate user data, ambient lux is " + minAmbientLux + " < " + mAmbientLux + " < " + maxAmbientLux); } @@ -559,7 +490,7 @@ class AutomaticBrightnessController { } private float calculateAmbientLux(long now, long horizon) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "calculateAmbientLux(" + now + ", " + horizon + ")"); } final int N = mAmbientLightRingBuffer.size(); @@ -578,7 +509,7 @@ class AutomaticBrightnessController { break; } } - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "calculateAmbientLux: selected endIndex=" + endIndex + ", point=(" + mAmbientLightRingBuffer.getTime(endIndex) + ", " + mAmbientLightRingBuffer.getLux(endIndex) + ")"); @@ -596,7 +527,7 @@ class AutomaticBrightnessController { final long startTime = eventTime - now; float weight = calculateWeight(startTime, endTime); float lux = mAmbientLightRingBuffer.getLux(i); - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "calculateAmbientLux: [" + startTime + ", " + endTime + "]: " + "lux=" + lux + ", " + "weight=" + weight); @@ -605,7 +536,7 @@ class AutomaticBrightnessController { sum += lux * weight; endTime = startTime; } - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "calculateAmbientLux: " + "totalWeight=" + totalWeight + ", " + "newAmbientLux=" + (sum / totalWeight)); @@ -660,7 +591,7 @@ class AutomaticBrightnessController { final long timeWhenSensorWarmedUp = mLightSensorWarmUpTimeConfig + mLightSensorEnableTime; if (time < timeWhenSensorWarmedUp) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "updateAmbientLux: Sensor not ready yet: " + "time=" + time + ", " + "timeWhenSensorWarmedUp=" + timeWhenSensorWarmedUp); @@ -671,7 +602,7 @@ class AutomaticBrightnessController { } setAmbientLux(calculateAmbientLux(time, AMBIENT_LIGHT_SHORT_HORIZON_MILLIS)); mAmbientLuxValid = true; - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "updateAmbientLux: Initializing: " + "mAmbientLightRingBuffer=" + mAmbientLightRingBuffer + ", " + "mAmbientLux=" + mAmbientLux); @@ -699,10 +630,10 @@ class AutomaticBrightnessController { && fastAmbientLux <= mAmbientDarkeningThreshold && nextDarkenTransition <= time)) { setAmbientLux(fastAmbientLux); - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "updateAmbientLux: " + ((fastAmbientLux > mAmbientLux) ? "Brightened" : "Darkened") + ": " - + "mBrighteningLuxThreshold=" + mAmbientBrighteningThreshold + ", " + + "mAmbientBrighteningThreshold=" + mAmbientBrighteningThreshold + ", " + "mAmbientLightRingBuffer=" + mAmbientLightRingBuffer + ", " + "mAmbientLux=" + mAmbientLux); } @@ -719,7 +650,7 @@ class AutomaticBrightnessController { // weighted ambient lux or not. nextTransitionTime = nextTransitionTime > time ? nextTransitionTime : time + mNormalLightSensorRate; - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "updateAmbientLux: Scheduling ambient lux update for " + nextTransitionTime + TimeUtils.formatUptime(nextTransitionTime)); } @@ -731,8 +662,7 @@ class AutomaticBrightnessController { return; } - float value = mBrightnessMapper.getBrightness(mAmbientLux, mForegroundAppPackageName, - mForegroundAppCategory); + float value = mBrightnessMapper.getBrightness(mAmbientLux); int newScreenAutoBrightness = clampScreenBrightness(Math.round(value * PowerManager.BRIGHTNESS_ON)); @@ -743,7 +673,7 @@ class AutomaticBrightnessController { if (mScreenAutoBrightness != -1 && newScreenAutoBrightness > mScreenDarkeningThreshold && newScreenAutoBrightness < mScreenBrighteningThreshold) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "ignoring newScreenAutoBrightness: " + mScreenDarkeningThreshold + " < " + newScreenAutoBrightness + " < " + mScreenBrighteningThreshold); } @@ -751,7 +681,8 @@ class AutomaticBrightnessController { } if (mScreenAutoBrightness != newScreenAutoBrightness) { - if (mLoggingEnabled) { + + if (DEBUG) { Slog.d(TAG, "updateAutoBrightness: " + "mScreenAutoBrightness=" + mScreenAutoBrightness + ", " + "newScreenAutoBrightness=" + newScreenAutoBrightness); @@ -787,11 +718,18 @@ class AutomaticBrightnessController { BRIGHTNESS_ADJUSTMENT_SAMPLE_DEBOUNCE_MILLIS); } + private void cancelBrightnessAdjustmentSample() { + if (mBrightnessAdjustmentSamplePending) { + mBrightnessAdjustmentSamplePending = false; + mHandler.removeMessages(MSG_BRIGHTNESS_ADJUSTMENT_SAMPLE); + } + } + private void collectBrightnessAdjustmentSample() { if (mBrightnessAdjustmentSamplePending) { mBrightnessAdjustmentSamplePending = false; if (mAmbientLuxValid && mScreenAutoBrightness >= 0) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "Auto-brightness adjustment changed by user: " + "lux=" + mAmbientLux + ", " + "brightness=" + mScreenAutoBrightness + ", " + @@ -807,68 +745,6 @@ class AutomaticBrightnessController { } } - // Register a TaskStackListener to call back to us onTaskStackChanged, so we can update the - // foreground app's package name and category and correct the brightness accordingly. - private void registerForegroundAppUpdater() { - try { - mActivityTaskManager.registerTaskStackListener(mTaskStackListener); - // This will not get called until the foreground app changes for the first time, so - // call it explicitly to get the current foreground app's info. - updateForegroundApp(); - } catch (RemoteException e) { - // Nothing to do. - } - } - - private void unregisterForegroundAppUpdater() { - try { - mActivityTaskManager.unregisterTaskStackListener(mTaskStackListener); - } catch (RemoteException e) { - // Nothing to do. - } - mForegroundAppPackageName = null; - mForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; - } - - // Set the foreground app's package name and category, so brightness can be corrected per app. - private void updateForegroundApp() { - // The ActivityTaskManager's lock tends to get contended, so this is done in a background - // thread and applied via this thread's handler synchronously. - BackgroundThread.getHandler().post(new Runnable() { - public void run() { - try { - // The foreground app is the top activity of the focused tasks stack. - final StackInfo info = mActivityTaskManager.getFocusedStackInfo(); - if (info == null || info.topActivity == null) { - return; - } - final String packageName = info.topActivity.getPackageName(); - // If the app didn't change, there's nothing to do. Otherwise, we have to - // update the category and re-apply the brightness correction. - if (mForegroundAppPackageName != null - && mForegroundAppPackageName.equals(packageName)) { - return; - } - mPendingForegroundAppPackageName = packageName; - ApplicationInfo app = mPackageManagerInternal.getApplicationInfo(packageName, - 0 /* flags */, Process.SYSTEM_UID /* filterCallingUid */, mUserId); - mPendingForegroundAppCategory = app.category; - mHandler.sendEmptyMessage(MSG_UPDATE_FOREGROUND_APP_SYNC); - } catch (RemoteException e) { - // Nothing to do. - } - } - }); - } - - private void updateForegroundAppSync() { - mForegroundAppPackageName = mPendingForegroundAppPackageName; - mPendingForegroundAppPackageName = null; - mForegroundAppCategory = mPendingForegroundAppCategory; - mPendingForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; - updateAutoBrightness(true /* sendUpdate */); - } - private final class AutomaticBrightnessHandler extends Handler { public AutomaticBrightnessHandler(Looper looper) { super(looper, null, true /*async*/); @@ -888,14 +764,6 @@ class AutomaticBrightnessController { case MSG_INVALIDATE_SHORT_TERM_MODEL: invalidateShortTermModel(); break; - - case MSG_UPDATE_FOREGROUND_APP: - updateForegroundApp(); - break; - - case MSG_UPDATE_FOREGROUND_APP_SYNC: - updateForegroundAppSync(); - break; } } } @@ -916,15 +784,6 @@ class AutomaticBrightnessController { } }; - // Call back whenever the tasks stack changes, which includes tasks being created, removed, and - // moving to top. - class TaskStackListenerImpl extends TaskStackListener { - @Override - public void onTaskStackChanged() { - mHandler.sendEmptyMessage(MSG_UPDATE_FOREGROUND_APP); - } - } - /** Callbacks to request updates to the display's power state. */ interface Callbacks { void updateBrightness(); diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java index 9fce644d6c4b..76c191d5e9ea 100644 --- a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -17,11 +17,9 @@ package com.android.server.display; import android.annotation.Nullable; -import android.content.pm.ApplicationInfo; import android.content.res.Resources; import android.content.res.TypedArray; import android.hardware.display.BrightnessConfiguration; -import android.hardware.display.BrightnessCorrection; import android.os.PowerManager; import android.util.MathUtils; import android.util.Pair; @@ -44,12 +42,11 @@ import java.util.Arrays; */ public abstract class BrightnessMappingStrategy { private static final String TAG = "BrightnessMappingStrategy"; + private static final boolean DEBUG = false; private static final float LUX_GRAD_SMOOTHING = 0.25f; private static final float MAX_GRAD = 1.0f; - protected boolean mLoggingEnabled; - private static final Plog PLOG = Plog.createSystemPlog(TAG); @Nullable @@ -164,22 +161,6 @@ public abstract class BrightnessMappingStrategy { } /** - * Enable/disable logging. - * - * @param loggingEnabled - * Whether logging should be on/off. - * - * @return Whether the method succeeded or not. - */ - public boolean setLoggingEnabled(boolean loggingEnabled) { - if (mLoggingEnabled == loggingEnabled) { - return false; - } - mLoggingEnabled = loggingEnabled; - return true; - } - - /** * Sets the {@link BrightnessConfiguration}. * * @param config The new configuration. If {@code null} is passed, the default configuration is @@ -189,33 +170,15 @@ public abstract class BrightnessMappingStrategy { public abstract boolean setBrightnessConfiguration(@Nullable BrightnessConfiguration config); /** - * Returns the desired brightness of the display based on the current ambient lux, including - * any context-related corrections. - * - * The returned brightness will be in the range [0, 1.0], where 1.0 is the display at max - * brightness and 0 is the display at minimum brightness. - * - * @param lux The current ambient brightness in lux. - * @param packageName the foreground app package name. - * @param category the foreground app package category. - * @return The desired brightness of the display normalized to the range [0, 1.0]. - */ - public abstract float getBrightness(float lux, String packageName, - @ApplicationInfo.Category int category); - - /** * Returns the desired brightness of the display based on the current ambient lux. * - * The returned brightness wil be in the range [0, 1.0], where 1.0 is the display at max + * The returned brightness will be in the range [0, 1.0], where 1.0 is the display at max * brightness and 0 is the display at minimum brightness. * * @param lux The current ambient brightness in lux. - * * @return The desired brightness of the display normalized to the range [0, 1.0]. */ - public float getBrightness(float lux) { - return getBrightness(lux, null /* packageName */, ApplicationInfo.CATEGORY_UNDEFINED); - } + public abstract float getBrightness(float lux); /** * Returns the current auto-brightness adjustment. @@ -276,13 +239,13 @@ public abstract class BrightnessMappingStrategy { public abstract void dump(PrintWriter pw); - protected float normalizeAbsoluteBrightness(int brightness) { + private static float normalizeAbsoluteBrightness(int brightness) { brightness = MathUtils.constrain(brightness, PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON); return (float) brightness / PowerManager.BRIGHTNESS_ON; } - private Pair<float[], float[]> insertControlPoint( + private static Pair<float[], float[]> insertControlPoint( float[] luxLevels, float[] brightnessLevels, float lux, float brightness) { final int idx = findInsertionPoint(luxLevels, lux); final float[] newLuxLevels; @@ -315,7 +278,7 @@ public abstract class BrightnessMappingStrategy { * This assumes that {@code arr} is sorted. If all values in {@code arr} are greater * than val, then it will return the length of arr as the insertion point. */ - private int findInsertionPoint(float[] arr, float val) { + private static int findInsertionPoint(float[] arr, float val) { for (int i = 0; i < arr.length; i++) { if (val <= arr[i]) { return i; @@ -324,8 +287,8 @@ public abstract class BrightnessMappingStrategy { return arr.length; } - private void smoothCurve(float[] lux, float[] brightness, int idx) { - if (mLoggingEnabled) { + private static void smoothCurve(float[] lux, float[] brightness, int idx) { + if (DEBUG) { PLOG.logCurve("unsmoothed curve", lux, brightness); } float prevLux = lux[idx]; @@ -360,19 +323,19 @@ public abstract class BrightnessMappingStrategy { prevBrightness = newBrightness; brightness[i] = newBrightness; } - if (mLoggingEnabled) { + if (DEBUG) { PLOG.logCurve("smoothed curve", lux, brightness); } } - private float permissibleRatio(float currLux, float prevLux) { + private static float permissibleRatio(float currLux, float prevLux) { return MathUtils.exp(MAX_GRAD * (MathUtils.log(currLux + LUX_GRAD_SMOOTHING) - MathUtils.log(prevLux + LUX_GRAD_SMOOTHING))); } - protected float inferAutoBrightnessAdjustment(float maxGamma, float desiredBrightness, - float currentBrightness) { + private static float inferAutoBrightnessAdjustment(float maxGamma, + float desiredBrightness, float currentBrightness) { float adjustment = 0; float gamma = Float.NaN; // Extreme edge cases: use a simpler heuristic, as proper gamma correction around the edges @@ -392,7 +355,7 @@ public abstract class BrightnessMappingStrategy { adjustment = -MathUtils.log(gamma) / MathUtils.log(maxGamma); } adjustment = MathUtils.constrain(adjustment, -1, +1); - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "inferAutoBrightnessAdjustment: " + maxGamma + "^" + -adjustment + "=" + MathUtils.pow(maxGamma, -adjustment) + " == " + gamma); Slog.d(TAG, "inferAutoBrightnessAdjustment: " + currentBrightness + "^" + gamma + "=" + @@ -401,16 +364,16 @@ public abstract class BrightnessMappingStrategy { return adjustment; } - protected Pair<float[], float[]> getAdjustedCurve(float[] lux, float[] brightness, + private static Pair<float[], float[]> getAdjustedCurve(float[] lux, float[] brightness, float userLux, float userBrightness, float adjustment, float maxGamma) { float[] newLux = lux; float[] newBrightness = Arrays.copyOf(brightness, brightness.length); - if (mLoggingEnabled) { + if (DEBUG) { PLOG.logCurve("unadjusted curve", newLux, newBrightness); } adjustment = MathUtils.constrain(adjustment, -1, 1); float gamma = MathUtils.pow(maxGamma, -adjustment); - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "getAdjustedCurve: " + maxGamma + "^" + -adjustment + "=" + MathUtils.pow(maxGamma, -adjustment) + " == " + gamma); } @@ -419,7 +382,7 @@ public abstract class BrightnessMappingStrategy { newBrightness[i] = MathUtils.pow(newBrightness[i], gamma); } } - if (mLoggingEnabled) { + if (DEBUG) { PLOG.logCurve("gamma adjusted curve", newLux, newBrightness); } if (userLux != -1) { @@ -427,7 +390,7 @@ public abstract class BrightnessMappingStrategy { userBrightness); newLux = curve.first; newBrightness = curve.second; - if (mLoggingEnabled) { + if (DEBUG) { PLOG.logCurve("gamma and user adjusted curve", newLux, newBrightness); // This is done for comparison. curve = insertControlPoint(lux, brightness, userLux, userBrightness); @@ -477,7 +440,7 @@ public abstract class BrightnessMappingStrategy { mAutoBrightnessAdjustment = 0; mUserLux = -1; mUserBrightness = -1; - if (mLoggingEnabled) { + if (DEBUG) { PLOG.start("simple mapping strategy"); } computeSpline(); @@ -489,8 +452,7 @@ public abstract class BrightnessMappingStrategy { } @Override - public float getBrightness(float lux, String packageName, - @ApplicationInfo.Category int category) { + public float getBrightness(float lux) { return mSpline.interpolate(lux); } @@ -505,7 +467,7 @@ public abstract class BrightnessMappingStrategy { if (adjustment == mAutoBrightnessAdjustment) { return false; } - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "setAutoBrightnessAdjustment: " + mAutoBrightnessAdjustment + " => " + adjustment); PLOG.start("auto-brightness adjustment"); @@ -523,7 +485,7 @@ public abstract class BrightnessMappingStrategy { @Override public void addUserDataPoint(float lux, float brightness) { float unadjustedBrightness = getUnadjustedBrightness(lux); - if (mLoggingEnabled) { + if (DEBUG){ Slog.d(TAG, "addUserDataPoint: (" + lux + "," + brightness + ")"); PLOG.start("add user data point") .logPoint("user data point", lux, brightness) @@ -532,7 +494,7 @@ public abstract class BrightnessMappingStrategy { float adjustment = inferAutoBrightnessAdjustment(mMaxGamma, brightness /* desiredBrightness */, unadjustedBrightness /* currentBrightness */); - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "addUserDataPoint: " + mAutoBrightnessAdjustment + " => " + adjustment); } @@ -545,7 +507,7 @@ public abstract class BrightnessMappingStrategy { @Override public void clearUserDataPoints() { if (mUserLux != -1) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "clearUserDataPoints: " + mAutoBrightnessAdjustment + " => 0"); PLOG.start("clear user data points") .logPoint("user data point", mUserLux, mUserBrightness); @@ -652,7 +614,7 @@ public abstract class BrightnessMappingStrategy { mBacklightToNitsSpline = Spline.createSpline(normalizedBacklight, nits); mDefaultConfig = config; - if (mLoggingEnabled) { + if (DEBUG) { PLOG.start("physical mapping strategy"); } mConfig = config; @@ -667,7 +629,7 @@ public abstract class BrightnessMappingStrategy { if (config.equals(mConfig)) { return false; } - if (mLoggingEnabled) { + if (DEBUG) { PLOG.start("brightness configuration"); } mConfig = config; @@ -676,17 +638,9 @@ public abstract class BrightnessMappingStrategy { } @Override - public float getBrightness(float lux, String packageName, - @ApplicationInfo.Category int category) { + public float getBrightness(float lux) { float nits = mBrightnessSpline.interpolate(lux); float backlight = mNitsToBacklightSpline.interpolate(nits); - // Correct the brightness according to the current application and its category, but - // only if no user data point is set (as this will oevrride the user setting). - if (mUserLux == -1) { - backlight = correctBrightness(backlight, packageName, category); - } else if (mLoggingEnabled) { - Slog.d(TAG, "user point set, correction not applied"); - } return backlight; } @@ -701,7 +655,7 @@ public abstract class BrightnessMappingStrategy { if (adjustment == mAutoBrightnessAdjustment) { return false; } - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "setAutoBrightnessAdjustment: " + mAutoBrightnessAdjustment + " => " + adjustment); PLOG.start("auto-brightness adjustment"); @@ -719,7 +673,7 @@ public abstract class BrightnessMappingStrategy { @Override public void addUserDataPoint(float lux, float brightness) { float unadjustedBrightness = getUnadjustedBrightness(lux); - if (mLoggingEnabled) { + if (DEBUG){ Slog.d(TAG, "addUserDataPoint: (" + lux + "," + brightness + ")"); PLOG.start("add user data point") .logPoint("user data point", lux, brightness) @@ -728,7 +682,7 @@ public abstract class BrightnessMappingStrategy { float adjustment = inferAutoBrightnessAdjustment(mMaxGamma, brightness /* desiredBrightness */, unadjustedBrightness /* currentBrightness */); - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "addUserDataPoint: " + mAutoBrightnessAdjustment + " => " + adjustment); } @@ -741,7 +695,7 @@ public abstract class BrightnessMappingStrategy { @Override public void clearUserDataPoints() { if (mUserLux != -1) { - if (mLoggingEnabled) { + if (DEBUG) { Slog.d(TAG, "clearUserDataPoints: " + mAutoBrightnessAdjustment + " => 0"); PLOG.start("clear user data points") .logPoint("user data point", mUserLux, mUserBrightness); @@ -804,21 +758,5 @@ public abstract class BrightnessMappingStrategy { Spline spline = Spline.createSpline(curve.first, curve.second); return mNitsToBacklightSpline.interpolate(spline.interpolate(lux)); } - - private float correctBrightness(float brightness, String packageName, int category) { - if (packageName != null) { - BrightnessCorrection correction = mConfig.getCorrectionByPackageName(packageName); - if (correction != null) { - return correction.apply(brightness); - } - } - if (category != ApplicationInfo.CATEGORY_UNDEFINED) { - BrightnessCorrection correction = mConfig.getCorrectionByCategory(category); - if (correction != null) { - return correction.apply(brightness); - } - } - return brightness; - } } } diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index b1ba05c035b3..0a1a9a20e0da 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -2144,14 +2144,6 @@ public final class DisplayManagerService extends SystemService { mContext.getPackageName()); } - void setAutoBrightnessLoggingEnabled(boolean enabled) { - if (mDisplayPowerController != null) { - synchronized (mSyncRoot) { - mDisplayPowerController.setAutoBrightnessLoggingEnabled(enabled); - } - } - } - private boolean validatePackageName(int uid, String packageName) { if (packageName != null) { String[] packageNames = mContext.getPackageManager().getPackagesForUid(uid); diff --git a/services/core/java/com/android/server/display/DisplayManagerShellCommand.java b/services/core/java/com/android/server/display/DisplayManagerShellCommand.java index abbfc7b18f94..27cad1eece09 100644 --- a/services/core/java/com/android/server/display/DisplayManagerShellCommand.java +++ b/services/core/java/com/android/server/display/DisplayManagerShellCommand.java @@ -17,9 +17,14 @@ package com.android.server.display; import android.content.Intent; +import android.os.RemoteException; +import android.os.ResultReceiver; +import android.os.ShellCallback; import android.os.ShellCommand; +import android.util.Slog; import java.io.PrintWriter; +import java.lang.NumberFormatException; class DisplayManagerShellCommand extends ShellCommand { private static final String TAG = "DisplayManagerShellCommand"; @@ -41,10 +46,6 @@ class DisplayManagerShellCommand extends ShellCommand { return setBrightness(); case "reset-brightness-configuration": return resetBrightnessConfiguration(); - case "ab-logging-enable": - return setAutoBrightnessLoggingEnabled(true); - case "ab-logging-disable": - return setAutoBrightnessLoggingEnabled(false); default: return handleDefaultCommands(cmd); } @@ -61,10 +62,6 @@ class DisplayManagerShellCommand extends ShellCommand { pw.println(" Sets the current brightness to BRIGHTNESS (a number between 0 and 1)."); pw.println(" reset-brightness-configuration"); pw.println(" Reset the brightness to its default configuration."); - pw.println(" ab-logging-enable"); - pw.println(" Enable auto-brightness logging."); - pw.println(" ab-logging-disable"); - pw.println(" Disable auto-brightness logging."); pw.println(); Intent.printIntentArgsHelp(pw , ""); } @@ -92,9 +89,4 @@ class DisplayManagerShellCommand extends ShellCommand { mService.resetBrightnessConfiguration(); return 0; } - - private int setAutoBrightnessLoggingEnabled(boolean enabled) { - mService.setAutoBrightnessLoggingEnabled(enabled); - return 0; - } } diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index c9ed9f7cea43..249270bfda7e 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -523,9 +523,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call public void onSwitchUser(@UserIdInt int newUserId) { handleSettingsChange(true /* userSwitch */); mBrightnessTracker.onSwitchUser(newUserId); - if (mAutomaticBrightnessController != null) { - mAutomaticBrightnessController.onSwitchUser(newUserId); - } } public ParceledListSlice<AmbientBrightnessDayStats> getAmbientBrightnessStats( @@ -1839,10 +1836,4 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mHandler.sendMessage(msg); } } - - void setAutoBrightnessLoggingEnabled(boolean enabled) { - if (mAutomaticBrightnessController != null) { - mAutomaticBrightnessController.setLoggingEnabled(enabled); - } - } } diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java index 9aec43b6eaed..89cef621a55d 100644 --- a/services/core/java/com/android/server/display/PersistentDataStore.java +++ b/services/core/java/com/android/server/display/PersistentDataStore.java @@ -16,6 +16,13 @@ package com.android.server.display; +import com.android.internal.util.FastXmlSerializer; +import com.android.internal.util.XmlUtils; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlSerializer; + import android.annotation.Nullable; import android.graphics.Point; import android.hardware.display.BrightnessConfiguration; @@ -23,20 +30,13 @@ import android.hardware.display.WifiDisplay; import android.util.AtomicFile; import android.util.Slog; import android.util.SparseArray; +import android.util.Pair; import android.util.SparseLongArray; import android.util.TimeUtils; import android.util.Xml; import android.view.Display; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.util.FastXmlSerializer; -import com.android.internal.util.XmlUtils; - -import libcore.io.IoUtils; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlSerializer; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -50,9 +50,12 @@ import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; +import libcore.io.IoUtils; + /** * Manages persistent state recorded by the display manager service as an XML file. * Caller must acquire lock on the data store before accessing it. @@ -107,9 +110,14 @@ final class PersistentDataStore { private static final String TAG_BRIGHTNESS_CONFIGURATIONS = "brightness-configurations"; private static final String TAG_BRIGHTNESS_CONFIGURATION = "brightness-configuration"; + private static final String TAG_BRIGHTNESS_CURVE = "brightness-curve"; + private static final String TAG_BRIGHTNESS_POINT = "brightness-point"; private static final String ATTR_USER_SERIAL = "user-serial"; private static final String ATTR_PACKAGE_NAME = "package-name"; private static final String ATTR_TIME_STAMP = "timestamp"; + private static final String ATTR_LUX = "lux"; + private static final String ATTR_NITS = "nits"; + private static final String ATTR_DESCRIPTION = "description"; // Remembered Wifi display devices. private ArrayList<WifiDisplay> mRememberedWifiDisplays = new ArrayList<WifiDisplay>(); @@ -638,8 +646,7 @@ final class PersistentDataStore { } try { - BrightnessConfiguration config = - BrightnessConfiguration.loadFromXml(parser); + BrightnessConfiguration config = loadConfigurationFromXml(parser); if (userSerial >= 0 && config != null) { mConfigurations.put(userSerial, config); if (timeStamp != -1) { @@ -656,6 +663,56 @@ final class PersistentDataStore { } } + private static BrightnessConfiguration loadConfigurationFromXml(XmlPullParser parser) + throws IOException, XmlPullParserException { + final int outerDepth = parser.getDepth(); + String description = null; + Pair<float[], float[]> curve = null; + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + if (TAG_BRIGHTNESS_CURVE.equals(parser.getName())) { + description = parser.getAttributeValue(null, ATTR_DESCRIPTION); + curve = loadCurveFromXml(parser); + } + } + if (curve == null) { + return null; + } + final BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder( + curve.first, curve.second); + builder.setDescription(description); + return builder.build(); + } + + private static Pair<float[], float[]> loadCurveFromXml(XmlPullParser parser) + throws IOException, XmlPullParserException { + final int outerDepth = parser.getDepth(); + List<Float> luxLevels = new ArrayList<>(); + List<Float> nitLevels = new ArrayList<>(); + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + if (TAG_BRIGHTNESS_POINT.equals(parser.getName())) { + luxLevels.add(loadFloat(parser.getAttributeValue(null, ATTR_LUX))); + nitLevels.add(loadFloat(parser.getAttributeValue(null, ATTR_NITS))); + } + } + final int N = luxLevels.size(); + float[] lux = new float[N]; + float[] nits = new float[N]; + for (int i = 0; i < N; i++) { + lux[i] = luxLevels.get(i); + nits[i] = nitLevels.get(i); + } + return Pair.create(lux, nits); + } + + private static float loadFloat(String val) { + try { + return Float.parseFloat(val); + } catch (NullPointerException | NumberFormatException e) { + Slog.e(TAG, "Failed to parse float loading brightness config", e); + return Float.NEGATIVE_INFINITY; + } + } + public void saveToXml(XmlSerializer serializer) throws IOException { for (int i = 0; i < mConfigurations.size(); i++) { final int userSerial = mConfigurations.keyAt(i); @@ -671,11 +728,27 @@ final class PersistentDataStore { if (timestamp != -1) { serializer.attribute(null, ATTR_TIME_STAMP, Long.toString(timestamp)); } - config.saveToXml(serializer); + saveConfigurationToXml(serializer, config); serializer.endTag(null, TAG_BRIGHTNESS_CONFIGURATION); } } + private static void saveConfigurationToXml(XmlSerializer serializer, + BrightnessConfiguration config) throws IOException { + serializer.startTag(null, TAG_BRIGHTNESS_CURVE); + if (config.getDescription() != null) { + serializer.attribute(null, ATTR_DESCRIPTION, config.getDescription()); + } + final Pair<float[], float[]> curve = config.getCurve(); + for (int i = 0; i < curve.first.length; i++) { + serializer.startTag(null, TAG_BRIGHTNESS_POINT); + serializer.attribute(null, ATTR_LUX, Float.toString(curve.first[i])); + serializer.attribute(null, ATTR_NITS, Float.toString(curve.second[i])); + serializer.endTag(null, TAG_BRIGHTNESS_POINT); + } + serializer.endTag(null, TAG_BRIGHTNESS_CURVE); + } + public void dump(final PrintWriter pw, final String prefix) { for (int i = 0; i < mConfigurations.size(); i++) { final int userSerial = mConfigurations.keyAt(i); diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java index d154830062f6..1f0f94a7bf0b 100644 --- a/services/core/java/com/android/server/hdmi/Constants.java +++ b/services/core/java/com/android/server/hdmi/Constants.java @@ -18,6 +18,7 @@ package com.android.server.hdmi; import android.annotation.IntDef; import android.hardware.hdmi.HdmiDeviceInfo; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -316,7 +317,7 @@ final class Constants { * <p>When ARC is initiated, this port will be used to turn on ARC. */ static final String PROPERTY_SYSTEM_AUDIO_DEVICE_ARC_PORT = - "persist.sys.hdmi.property_sytem_audio_device_arc_port"; + "persist.sys.hdmi.property_sytem_audio_device_arc_port"; /** * Property to strip local audio of amplifier and use local speaker diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java index 3845954bc0d4..9690ba877c1e 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java @@ -95,6 +95,11 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice { startQueuedActions(); } + @Override + protected int findKeyReceiverAddress() { + return Constants.ADDR_TV; + } + @VisibleForTesting protected void systemAudioControlOnPowerOn( int systemAudioOnPowerOnProp, boolean lastSystemAudioControlStatus) { diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index f468c0bf6652..3420b263eac5 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -18,6 +18,7 @@ package com.android.server.hdmi; import static android.hardware.hdmi.HdmiControlManager.DEVICE_EVENT_ADD_DEVICE; import static android.hardware.hdmi.HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE; + import static com.android.server.hdmi.Constants.DISABLED; import static com.android.server.hdmi.Constants.ENABLED; import static com.android.server.hdmi.Constants.OPTION_MHL_ENABLE; @@ -67,6 +68,7 @@ import android.util.ArraySet; import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; + import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; @@ -76,6 +78,9 @@ import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly; import com.android.server.hdmi.HdmiCecController.AllocateAddressCallback; import com.android.server.hdmi.HdmiCecLocalDevice.ActiveSource; import com.android.server.hdmi.HdmiCecLocalDevice.PendingActionClearedCallback; + +import libcore.util.EmptyArray; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; @@ -85,7 +90,6 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import libcore.util.EmptyArray; /** * Provides a service for sending and processing HDMI control messages, @@ -1469,12 +1473,12 @@ public class HdmiControlService extends SystemService { @Override public boolean getSystemAudioMode() { + // TODO(shubang): handle getSystemAudioMode() for all device types enforceAccessPermission(); HdmiCecLocalDeviceTv tv = tv(); - if (tv == null) { - return false; - } - return tv.isSystemAudioActivated(); + HdmiCecLocalDeviceAudioSystem audioSystem = audioSystem(); + return (tv != null && tv.isSystemAudioActivated()) + || (audioSystem != null && audioSystem.isSystemAudioActivated()); } @Override diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index dd2abde10433..139d8ac6a8d5 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -19,6 +19,7 @@ package com.android.server.media; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.content.pm.ParceledListSlice; import android.media.AudioAttributes; import android.media.AudioManager; import android.media.AudioManagerInternal; @@ -26,16 +27,15 @@ import android.media.AudioSystem; import android.media.MediaMetadata; import android.media.Rating; import android.media.VolumeProvider; -import android.media.session.ControllerCallbackLink; import android.media.session.ISession; +import android.media.session.ISessionCallback; import android.media.session.ISessionController; +import android.media.session.ISessionControllerCallback; import android.media.session.MediaController; import android.media.session.MediaController.PlaybackInfo; import android.media.session.MediaSession; -import android.media.session.MediaSession.QueueItem; import android.media.session.ParcelableVolumeInfo; import android.media.session.PlaybackState; -import android.media.session.SessionCallbackLink; import android.net.Uri; import android.os.Binder; import android.os.Bundle; @@ -45,6 +45,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.Message; import android.os.Process; +import android.os.RemoteException; import android.os.ResultReceiver; import android.os.SystemClock; import android.util.Log; @@ -55,7 +56,6 @@ import com.android.server.LocalServices; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.List; /** * This is the system implementation of a Session. Apps will interact with the @@ -85,7 +85,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { private final Context mContext; private final Object mLock = new Object(); - private final ArrayList<ControllerCallbackLinkHolder> mControllerCallbackHolders = + private final ArrayList<ISessionControllerCallbackHolder> mControllerCallbackHolders = new ArrayList<>(); private long mFlags; @@ -98,7 +98,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { // may result in throwing an exception. private MediaMetadata mMetadata; private PlaybackState mPlaybackState; - private List<QueueItem> mQueue; + private ParceledListSlice mQueue; private CharSequence mQueueTitle; private int mRatingType; // End TransportPerformer fields @@ -121,7 +121,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { private String mMetadataDescription; public MediaSessionRecord(int ownerPid, int ownerUid, int userId, String ownerPackageName, - SessionCallbackLink cb, String tag, MediaSessionService service, Looper handlerLooper) { + ISessionCallback cb, String tag, MediaSessionService service, Looper handlerLooper) { mOwnerPid = ownerPid; mOwnerUid = ownerUid; mUserId = userId; @@ -236,6 +236,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { * {@link AudioManager#ADJUST_SAME}. * * @param packageName The package that made the original volume request. + * @param opPackageName The op package that made the original volume request. * @param pid The pid that made the original volume request. * @param uid The uid that made the original volume request. * @param caller caller binder. can be {@code null} if it's from the volume key. @@ -248,8 +249,8 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { * @param flags Any of the flags from {@link AudioManager}. * @param useSuggested True to use adjustSuggestedStreamVolume instead of */ - public void adjustVolume(String packageName, int pid, int uid, - ControllerCallbackLink caller, boolean asSystemService, int direction, int flags, + public void adjustVolume(String packageName, String opPackageName, int pid, int uid, + ISessionControllerCallback caller, boolean asSystemService, int direction, int flags, boolean useSuggested) { int previousFlagPlaySound = flags & AudioManager.FLAG_PLAY_SOUND; if (isPlaybackActive() || hasFlag(MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY)) { @@ -258,8 +259,8 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) { // Adjust the volume with a handler not to be blocked by other system service. int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs); - postAdjustLocalVolume(stream, direction, flags, packageName, uid, asSystemService, - useSuggested, previousFlagPlaySound); + postAdjustLocalVolume(stream, direction, flags, opPackageName, pid, uid, + asSystemService, useSuggested, previousFlagPlaySound); } else { if (mVolumeControlType == VolumeProvider.VOLUME_CONTROL_FIXED) { // Nothing to do, the volume cannot be changed @@ -290,11 +291,23 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } } - private void setVolumeTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, int value, int flags) { + private void setVolumeTo(String packageName, String opPackageName, int pid, int uid, + ISessionControllerCallback caller, int value, int flags) { if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) { int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs); - mAudioManagerInternal.setStreamVolumeForUid(stream, value, flags, packageName, uid); + final int volumeValue = value; + mHandler.post(new Runnable() { + @Override + public void run() { + try { + mAudioManagerInternal.setStreamVolumeForUid(stream, volumeValue, flags, + opPackageName, uid); + } catch (IllegalArgumentException | SecurityException e) { + Log.e(TAG, "Cannot set volume: stream=" + stream + ", value=" + volumeValue + + ", flags=" + flags, e); + } + } + }); } else { if (mVolumeControlType != VolumeProvider.VOLUME_CONTROL_ABSOLUTE) { // Nothing to do. The volume can't be set directly. @@ -428,7 +441,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } } - public SessionCallbackLink getCallback() { + public ISessionCallback getCallback() { return mSessionCb.mCb; } @@ -456,7 +469,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { + ", max=" + mMaxVolume + ", current=" + mCurrentVolume); pw.println(indent + "metadata: " + mMetadataDescription); pw.println(indent + "queueTitle=" + mQueueTitle + ", size=" - + (mQueue == null ? 0 : mQueue.size())); + + (mQueue == null ? 0 : mQueue.getList().size())); } @Override @@ -465,11 +478,19 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } private void postAdjustLocalVolume(final int stream, final int direction, final int flags, - final String callingPackageName, final int callingUid, final boolean asSystemService, - final boolean useSuggested, final int previousFlagPlaySound) { - final String packageName = asSystemService - ? mContext.getOpPackageName() : callingPackageName; - final int uid = asSystemService ? Process.SYSTEM_UID : callingUid; + final String callingOpPackageName, final int callingPid, final int callingUid, + final boolean asSystemService, final boolean useSuggested, + final int previousFlagPlaySound) { + // Must use opPackageName for adjusting volumes with UID. + final String opPackageName; + final int uid; + if (asSystemService) { + opPackageName = mContext.getOpPackageName(); + uid = Process.SYSTEM_UID; + } else { + opPackageName = callingOpPackageName; + uid = callingUid; + } mHandler.post(new Runnable() { @Override public void run() { @@ -477,19 +498,19 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { if (useSuggested) { if (AudioSystem.isStreamActive(stream, 0)) { mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(stream, - direction, flags, packageName, uid); + direction, flags, opPackageName, uid); } else { mAudioManagerInternal.adjustSuggestedStreamVolumeForUid( AudioManager.USE_DEFAULT_STREAM_TYPE, direction, - flags | previousFlagPlaySound, packageName, uid); + flags | previousFlagPlaySound, opPackageName, uid); } } else { mAudioManagerInternal.adjustStreamVolumeForUid(stream, direction, flags, - packageName, uid); + opPackageName, uid); } } catch (IllegalArgumentException | SecurityException e) { Log.e(TAG, "Cannot adjust volume: direction=" + direction + ", stream=" - + stream + ", flags=" + flags + ", packageName=" + packageName + + stream + ", flags=" + flags + ", opPackageName=" + opPackageName + ", uid=" + uid + ", useSuggested=" + useSuggested + ", previousFlagPlaySound=" + previousFlagPlaySound, e); } @@ -498,7 +519,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } private void logCallbackException( - String msg, ControllerCallbackLinkHolder holder, Exception e) { + String msg, ISessionControllerCallbackHolder holder, Exception e) { Log.v(TAG, msg + ", this=" + this + ", callback package=" + holder.mPackageName + ", exception=" + e); } @@ -509,18 +530,16 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifyPlaybackStateChanged(mPlaybackState); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushPlaybackStateUpdate", - holder, e); - } else { - logCallbackException("unexpected exception in pushPlaybackStateUpdate", - holder, e); - } + holder.mCallback.onPlaybackStateChanged(mPlaybackState); + } catch (DeadObjectException e) { + mControllerCallbackHolders.remove(i); + logCallbackException("Removed dead callback in pushPlaybackStateUpdate", + holder, e); + } catch (RemoteException e) { + logCallbackException("unexpected exception in pushPlaybackStateUpdate", + holder, e); } } } @@ -532,18 +551,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifyMetadataChanged(mMetadata); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushMetadataUpdate", - holder, e); - } else { - logCallbackException("unexpected exception in pushMetadataUpdate", - holder, e); - } + holder.mCallback.onMetadataChanged(mMetadata); + } catch (DeadObjectException e) { + logCallbackException("Removing dead callback in pushMetadataUpdate", holder, e); + mControllerCallbackHolders.remove(i); + } catch (RemoteException e) { + logCallbackException("unexpected exception in pushMetadataUpdate", holder, e); } } } @@ -555,17 +570,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifyQueueChanged(mQueue); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushQueueUpdate", - holder, e); - } else { - logCallbackException("unexpected exception in pushQueueUpdate", holder, e); - } + holder.mCallback.onQueueChanged(mQueue); + } catch (DeadObjectException e) { + mControllerCallbackHolders.remove(i); + logCallbackException("Removed dead callback in pushQueueUpdate", holder, e); + } catch (RemoteException e) { + logCallbackException("unexpected exception in pushQueueUpdate", holder, e); } } } @@ -577,18 +589,16 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifyQueueTitleChanged(mQueueTitle); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushQueueTitleUpdate", - holder, e); - } else { - logCallbackException("unexpected exception in pushQueueTitleUpdate", - holder, e); - } + holder.mCallback.onQueueTitleChanged(mQueueTitle); + } catch (DeadObjectException e) { + mControllerCallbackHolders.remove(i); + logCallbackException("Removed dead callback in pushQueueTitleUpdate", + holder, e); + } catch (RemoteException e) { + logCallbackException("unexpected exception in pushQueueTitleUpdate", + holder, e); } } } @@ -600,17 +610,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifyExtrasChanged(mExtras); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushExtrasUpdate", - holder, e); - } else { - logCallbackException("unexpected exception in pushExtrasUpdate", holder, e); - } + holder.mCallback.onExtrasChanged(mExtras); + } catch (DeadObjectException e) { + mControllerCallbackHolders.remove(i); + logCallbackException("Removed dead callback in pushExtrasUpdate", holder, e); + } catch (RemoteException e) { + logCallbackException("unexpected exception in pushExtrasUpdate", holder, e); } } } @@ -623,18 +630,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } ParcelableVolumeInfo info = mController.getVolumeAttributes(); for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifyVolumeInfoChanged(info.volumeType, info.audioAttrs, - info.controlType, info.maxVolume, info.currentVolume); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushVolumeUpdate", - holder, e); - } else { - logCallbackException("unexpected exception in pushVolumeUpdate", holder, e); - } + holder.mCallback.onVolumeInfoChanged(info); + } catch (DeadObjectException e) { + mControllerCallbackHolders.remove(i); + logCallbackException("Removing dead callback in pushVolumeUpdate", holder, e); + } catch (RemoteException e) { + logCallbackException("Unexpected exception in pushVolumeUpdate", holder, e); } } } @@ -646,16 +649,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifyEvent(event, data); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushEvent", holder, e); - } else { - logCallbackException("unexpected exception in pushEvent", holder, e); - } + holder.mCallback.onEvent(event, data); + } catch (DeadObjectException e) { + mControllerCallbackHolders.remove(i); + logCallbackException("Removing dead callback in pushEvent", holder, e); + } catch (RemoteException e) { + logCallbackException("unexpected exception in pushEvent", holder, e); } } } @@ -669,18 +670,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - ControllerCallbackLinkHolder holder = mControllerCallbackHolders.get(i); + ISessionControllerCallbackHolder holder = mControllerCallbackHolders.get(i); try { - holder.mCallback.notifySessionDestroyed(); - } catch (RuntimeException e) { - if (e.getCause() instanceof DeadObjectException) { - mControllerCallbackHolders.remove(i); - logCallbackException("Removing dead callback in pushSessionDestroyed", - holder, e); - } else { - logCallbackException("unexpected exception in pushSessionDestroyed", - holder, e); - } + holder.mCallback.onSessionDestroyed(); + } catch (DeadObjectException e) { + logCallbackException("Removing dead callback in pushEvent", holder, e); + mControllerCallbackHolders.remove(i); + } catch (RemoteException e) { + logCallbackException("unexpected exception in pushEvent", holder, e); } } // After notifying clear all listeners @@ -720,10 +717,10 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return result == null ? state : result; } - private int getControllerHolderIndexForCb(ControllerCallbackLink cb) { - IBinder binder = cb.getBinder(); + private int getControllerHolderIndexForCb(ISessionControllerCallback cb) { + IBinder binder = cb.asBinder(); for (int i = mControllerCallbackHolders.size() - 1; i >= 0; i--) { - if (binder.equals(mControllerCallbackHolders.get(i).mCallback.getBinder())) { + if (binder.equals(mControllerCallbackHolders.get(i).mCallback.asBinder())) { return i; } } @@ -847,7 +844,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } @Override - public void setQueue(List<QueueItem> queue) { + public void setQueue(ParceledListSlice queue) { synchronized (mLock) { mQueue = queue; } @@ -924,9 +921,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } class SessionCb { - private final SessionCallbackLink mCb; + private final ISessionCallback mCb; - SessionCb(SessionCallbackLink cb) { + public SessionCb(ISessionCallback cb) { mCb = cb; } @@ -934,224 +931,224 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { boolean asSystemService, KeyEvent keyEvent, int sequenceId, ResultReceiver cb) { try { if (asSystemService) { - mCb.notifyMediaButton(mContext.getPackageName(), Process.myPid(), + mCb.onMediaButton(mContext.getPackageName(), Process.myPid(), Process.SYSTEM_UID, createMediaButtonIntent(keyEvent), sequenceId, cb); } else { - mCb.notifyMediaButton(packageName, pid, uid, + mCb.onMediaButton(packageName, pid, uid, createMediaButtonIntent(keyEvent), sequenceId, cb); } return true; - } catch (RuntimeException e) { + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in sendMediaRequest.", e); } return false; } public boolean sendMediaButton(String packageName, int pid, int uid, - ControllerCallbackLink caller, boolean asSystemService, + ISessionControllerCallback caller, boolean asSystemService, KeyEvent keyEvent) { try { if (asSystemService) { - mCb.notifyMediaButton(mContext.getPackageName(), Process.myPid(), + mCb.onMediaButton(mContext.getPackageName(), Process.myPid(), Process.SYSTEM_UID, createMediaButtonIntent(keyEvent), 0, null); } else { - mCb.notifyMediaButtonFromController(packageName, pid, uid, caller, + mCb.onMediaButtonFromController(packageName, pid, uid, caller, createMediaButtonIntent(keyEvent)); } return true; - } catch (RuntimeException e) { + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in sendMediaRequest.", e); } return false; } public void sendCommand(String packageName, int pid, int uid, - ControllerCallbackLink caller, String command, Bundle args, ResultReceiver cb) { + ISessionControllerCallback caller, String command, Bundle args, ResultReceiver cb) { try { - mCb.notifyCommand(packageName, pid, uid, caller, command, args, cb); - } catch (RuntimeException e) { + mCb.onCommand(packageName, pid, uid, caller, command, args, cb); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in sendCommand.", e); } } public void sendCustomAction(String packageName, int pid, int uid, - ControllerCallbackLink caller, String action, + ISessionControllerCallback caller, String action, Bundle args) { try { - mCb.notifyCustomAction(packageName, pid, uid, caller, action, args); - } catch (RuntimeException e) { + mCb.onCustomAction(packageName, pid, uid, caller, action, args); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in sendCustomAction.", e); } } public void prepare(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { try { - mCb.notifyPrepare(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onPrepare(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in prepare.", e); } } public void prepareFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { + ISessionControllerCallback caller, String mediaId, Bundle extras) { try { - mCb.notifyPrepareFromMediaId(packageName, pid, uid, caller, mediaId, extras); - } catch (RuntimeException e) { + mCb.onPrepareFromMediaId(packageName, pid, uid, caller, mediaId, extras); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in prepareFromMediaId.", e); } } public void prepareFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { + ISessionControllerCallback caller, String query, Bundle extras) { try { - mCb.notifyPrepareFromSearch(packageName, pid, uid, caller, query, extras); - } catch (RuntimeException e) { + mCb.onPrepareFromSearch(packageName, pid, uid, caller, query, extras); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in prepareFromSearch.", e); } } public void prepareFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { + ISessionControllerCallback caller, Uri uri, Bundle extras) { try { - mCb.notifyPrepareFromUri(packageName, pid, uid, caller, uri, extras); - } catch (RuntimeException e) { + mCb.onPrepareFromUri(packageName, pid, uid, caller, uri, extras); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in prepareFromUri.", e); } } - public void play(String packageName, int pid, int uid, ControllerCallbackLink caller) { + public void play(String packageName, int pid, int uid, ISessionControllerCallback caller) { try { - mCb.notifyPlay(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onPlay(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in play.", e); } } public void playFromMediaId(String packageName, int pid, int uid, - ControllerCallbackLink caller, String mediaId, Bundle extras) { + ISessionControllerCallback caller, String mediaId, Bundle extras) { try { - mCb.notifyPlayFromMediaId(packageName, pid, uid, caller, mediaId, extras); - } catch (RuntimeException e) { + mCb.onPlayFromMediaId(packageName, pid, uid, caller, mediaId, extras); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in playFromMediaId.", e); } } public void playFromSearch(String packageName, int pid, int uid, - ControllerCallbackLink caller, String query, Bundle extras) { + ISessionControllerCallback caller, String query, Bundle extras) { try { - mCb.notifyPlayFromSearch(packageName, pid, uid, caller, query, extras); - } catch (RuntimeException e) { + mCb.onPlayFromSearch(packageName, pid, uid, caller, query, extras); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in playFromSearch.", e); } } public void playFromUri(String packageName, int pid, int uid, - ControllerCallbackLink caller, Uri uri, Bundle extras) { + ISessionControllerCallback caller, Uri uri, Bundle extras) { try { - mCb.notifyPlayFromUri(packageName, pid, uid, caller, uri, extras); - } catch (RuntimeException e) { + mCb.onPlayFromUri(packageName, pid, uid, caller, uri, extras); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in playFromUri.", e); } } public void skipToTrack(String packageName, int pid, int uid, - ControllerCallbackLink caller, long id) { + ISessionControllerCallback caller, long id) { try { - mCb.notifySkipToTrack(packageName, pid, uid, caller, id); - } catch (RuntimeException e) { + mCb.onSkipToTrack(packageName, pid, uid, caller, id); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in skipToTrack", e); } } - public void pause(String packageName, int pid, int uid, ControllerCallbackLink caller) { + public void pause(String packageName, int pid, int uid, ISessionControllerCallback caller) { try { - mCb.notifyPause(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onPause(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in pause.", e); } } - public void stop(String packageName, int pid, int uid, ControllerCallbackLink caller) { + public void stop(String packageName, int pid, int uid, ISessionControllerCallback caller) { try { - mCb.notifyStop(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onStop(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in stop.", e); } } - public void next(String packageName, int pid, int uid, ControllerCallbackLink caller) { + public void next(String packageName, int pid, int uid, ISessionControllerCallback caller) { try { - mCb.notifyNext(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onNext(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in next.", e); } } public void previous(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { try { - mCb.notifyPrevious(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onPrevious(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in previous.", e); } } public void fastForward(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { try { - mCb.notifyFastForward(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onFastForward(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in fastForward.", e); } } public void rewind(String packageName, int pid, int uid, - ControllerCallbackLink caller) { + ISessionControllerCallback caller) { try { - mCb.notifyRewind(packageName, pid, uid, caller); - } catch (RuntimeException e) { + mCb.onRewind(packageName, pid, uid, caller); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in rewind.", e); } } - public void seekTo(String packageName, int pid, int uid, ControllerCallbackLink caller, + public void seekTo(String packageName, int pid, int uid, ISessionControllerCallback caller, long pos) { try { - mCb.notifySeekTo(packageName, pid, uid, caller, pos); - } catch (RuntimeException e) { + mCb.onSeekTo(packageName, pid, uid, caller, pos); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in seekTo.", e); } } - public void rate(String packageName, int pid, int uid, ControllerCallbackLink caller, + public void rate(String packageName, int pid, int uid, ISessionControllerCallback caller, Rating rating) { try { - mCb.notifyRate(packageName, pid, uid, caller, rating); - } catch (RuntimeException e) { + mCb.onRate(packageName, pid, uid, caller, rating); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in rate.", e); } } public void adjustVolume(String packageName, int pid, int uid, - ControllerCallbackLink caller, boolean asSystemService, int direction) { + ISessionControllerCallback caller, boolean asSystemService, int direction) { try { if (asSystemService) { - mCb.notifyAdjustVolume(mContext.getPackageName(), Process.myPid(), + mCb.onAdjustVolume(mContext.getPackageName(), Process.myPid(), Process.SYSTEM_UID, null, direction); } else { - mCb.notifyAdjustVolume(packageName, pid, uid, caller, direction); + mCb.onAdjustVolume(packageName, pid, uid, caller, direction); } - } catch (RuntimeException e) { + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in adjustVolume.", e); } } public void setVolumeTo(String packageName, int pid, int uid, - ControllerCallbackLink caller, int value) { + ISessionControllerCallback caller, int value) { try { - mCb.notifySetVolumeTo(packageName, pid, uid, caller, value); - } catch (RuntimeException e) { + mCb.onSetVolumeTo(packageName, pid, uid, caller, value); + } catch (RemoteException e) { Slog.e(TAG, "Remote failure in setVolumeTo.", e); } } @@ -1165,34 +1162,34 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { class ControllerStub extends ISessionController.Stub { @Override - public void sendCommand(String packageName, ControllerCallbackLink caller, + public void sendCommand(String packageName, ISessionControllerCallback caller, String command, Bundle args, ResultReceiver cb) { mSessionCb.sendCommand(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, command, args, cb); } @Override - public boolean sendMediaButton(String packageName, ControllerCallbackLink cb, + public boolean sendMediaButton(String packageName, ISessionControllerCallback cb, boolean asSystemService, KeyEvent keyEvent) { return mSessionCb.sendMediaButton(packageName, Binder.getCallingPid(), Binder.getCallingUid(), cb, asSystemService, keyEvent); } @Override - public void registerCallbackListener(String packageName, ControllerCallbackLink cb) { + public void registerCallbackListener(String packageName, ISessionControllerCallback cb) { synchronized (mLock) { // If this session is already destroyed tell the caller and // don't add them. if (mDestroyed) { try { - cb.notifySessionDestroyed(); + cb.onSessionDestroyed(); } catch (Exception e) { // ignored } return; } if (getControllerHolderIndexForCb(cb) < 0) { - mControllerCallbackHolders.add(new ControllerCallbackLinkHolder(cb, + mControllerCallbackHolders.add(new ISessionControllerCallbackHolder(cb, packageName, Binder.getCallingUid())); if (DEBUG) { Log.d(TAG, "registering controller callback " + cb + " from controller" @@ -1203,14 +1200,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } @Override - public void unregisterCallbackListener(ControllerCallbackLink cb) { + public void unregisterCallbackListener(ISessionControllerCallback cb) { synchronized (mLock) { int index = getControllerHolderIndexForCb(cb); if (index != -1) { mControllerCallbackHolders.remove(index); } if (DEBUG) { - Log.d(TAG, "unregistering callback " + cb.getBinder()); + Log.d(TAG, "unregistering callback " + cb.asBinder()); } } } @@ -1256,137 +1253,139 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } @Override - public void adjustVolume(String packageName, ControllerCallbackLink caller, - boolean asSystemService, int direction, int flags) { + public void adjustVolume(String packageName, String opPackageName, + ISessionControllerCallback caller, boolean asSystemService, int direction, + int flags) { int pid = Binder.getCallingPid(); int uid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); try { - MediaSessionRecord.this.adjustVolume(packageName, pid, uid, caller, asSystemService, - direction, flags, false /* useSuggested */); + MediaSessionRecord.this.adjustVolume(packageName, opPackageName, pid, uid, caller, + asSystemService, direction, flags, false /* useSuggested */); } finally { Binder.restoreCallingIdentity(token); } } @Override - public void setVolumeTo(String packageName, ControllerCallbackLink caller, - int value, int flags) { + public void setVolumeTo(String packageName, String opPackageName, + ISessionControllerCallback caller, int value, int flags) { int pid = Binder.getCallingPid(); int uid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); try { - MediaSessionRecord.this.setVolumeTo(packageName, pid, uid, caller, value, flags); + MediaSessionRecord.this.setVolumeTo(packageName, opPackageName, pid, uid, caller, + value, flags); } finally { Binder.restoreCallingIdentity(token); } } @Override - public void prepare(String packageName, ControllerCallbackLink caller) { + public void prepare(String packageName, ISessionControllerCallback caller) { mSessionCb.prepare(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void prepareFromMediaId(String packageName, ControllerCallbackLink caller, + public void prepareFromMediaId(String packageName, ISessionControllerCallback caller, String mediaId, Bundle extras) { mSessionCb.prepareFromMediaId(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, mediaId, extras); } @Override - public void prepareFromSearch(String packageName, ControllerCallbackLink caller, + public void prepareFromSearch(String packageName, ISessionControllerCallback caller, String query, Bundle extras) { mSessionCb.prepareFromSearch(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, query, extras); } @Override - public void prepareFromUri(String packageName, ControllerCallbackLink caller, + public void prepareFromUri(String packageName, ISessionControllerCallback caller, Uri uri, Bundle extras) { mSessionCb.prepareFromUri(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, uri, extras); } @Override - public void play(String packageName, ControllerCallbackLink caller) { + public void play(String packageName, ISessionControllerCallback caller) { mSessionCb.play(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void playFromMediaId(String packageName, ControllerCallbackLink caller, + public void playFromMediaId(String packageName, ISessionControllerCallback caller, String mediaId, Bundle extras) { mSessionCb.playFromMediaId(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, mediaId, extras); } @Override - public void playFromSearch(String packageName, ControllerCallbackLink caller, + public void playFromSearch(String packageName, ISessionControllerCallback caller, String query, Bundle extras) { mSessionCb.playFromSearch(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, query, extras); } @Override - public void playFromUri(String packageName, ControllerCallbackLink caller, + public void playFromUri(String packageName, ISessionControllerCallback caller, Uri uri, Bundle extras) { mSessionCb.playFromUri(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, uri, extras); } @Override - public void skipToQueueItem(String packageName, ControllerCallbackLink caller, + public void skipToQueueItem(String packageName, ISessionControllerCallback caller, long id) { mSessionCb.skipToTrack(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, id); } @Override - public void pause(String packageName, ControllerCallbackLink caller) { + public void pause(String packageName, ISessionControllerCallback caller) { mSessionCb.pause(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void stop(String packageName, ControllerCallbackLink caller) { + public void stop(String packageName, ISessionControllerCallback caller) { mSessionCb.stop(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void next(String packageName, ControllerCallbackLink caller) { + public void next(String packageName, ISessionControllerCallback caller) { mSessionCb.next(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void previous(String packageName, ControllerCallbackLink caller) { + public void previous(String packageName, ISessionControllerCallback caller) { mSessionCb.previous(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void fastForward(String packageName, ControllerCallbackLink caller) { + public void fastForward(String packageName, ISessionControllerCallback caller) { mSessionCb.fastForward(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void rewind(String packageName, ControllerCallbackLink caller) { + public void rewind(String packageName, ISessionControllerCallback caller) { mSessionCb.rewind(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller); } @Override - public void seekTo(String packageName, ControllerCallbackLink caller, long pos) { + public void seekTo(String packageName, ISessionControllerCallback caller, long pos) { mSessionCb.seekTo(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, pos); } @Override - public void rate(String packageName, ControllerCallbackLink caller, Rating rating) { + public void rate(String packageName, ISessionControllerCallback caller, Rating rating) { mSessionCb.rate(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, rating); } @Override - public void sendCustomAction(String packageName, ControllerCallbackLink caller, + public void sendCustomAction(String packageName, ISessionControllerCallback caller, String action, Bundle args) { mSessionCb.sendCustomAction(packageName, Binder.getCallingPid(), Binder.getCallingUid(), caller, action, args); @@ -1405,7 +1404,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } @Override - public List<QueueItem> getQueue() { + public ParceledListSlice getQueue() { synchronized (mLock) { return mQueue; } @@ -1434,12 +1433,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } } - private class ControllerCallbackLinkHolder { - private final ControllerCallbackLink mCallback; + private class ISessionControllerCallbackHolder { + private final ISessionControllerCallback mCallback; private final String mPackageName; private final int mUid; - ControllerCallbackLinkHolder(ControllerCallbackLink callback, String packageName, + ISessionControllerCallbackHolder(ISessionControllerCallback callback, String packageName, int uid) { mCallback = callback; mPackageName = packageName; diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index b807c47c09b9..052d5797c1e7 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -35,19 +35,21 @@ import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; import android.database.ContentObserver; import android.media.AudioManager; +import android.media.AudioManagerInternal; import android.media.AudioPlaybackConfiguration; import android.media.AudioSystem; import android.media.IAudioService; import android.media.IRemoteVolumeController; +import android.media.Session2Token; import android.media.session.IActiveSessionsListener; import android.media.session.ICallback; import android.media.session.IOnMediaKeyListener; import android.media.session.IOnVolumeKeyLongPressListener; import android.media.session.ISession; +import android.media.session.ISessionCallback; import android.media.session.ISessionManager; import android.media.session.MediaSession; import android.media.session.MediaSessionManager; -import android.media.session.SessionCallbackLink; import android.net.Uri; import android.os.Binder; import android.os.Bundle; @@ -72,6 +74,7 @@ import android.view.KeyEvent; import android.view.ViewConfiguration; import com.android.internal.util.DumpUtils; +import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.Watchdog; import com.android.server.Watchdog.Monitor; @@ -108,6 +111,8 @@ public class MediaSessionService extends SystemService implements Monitor { private KeyguardManager mKeyguardManager; private IAudioService mAudioService; + private AudioManagerInternal mAudioManagerInternal; + private ActivityManager mActivityManager; private ContentResolver mContentResolver; private SettingsObserver mSettingsObserver; private boolean mHasFeatureLeanback; @@ -139,6 +144,9 @@ public class MediaSessionService extends SystemService implements Monitor { mKeyguardManager = (KeyguardManager) getContext().getSystemService(Context.KEYGUARD_SERVICE); mAudioService = getAudioService(); + mAudioManagerInternal = LocalServices.getService(AudioManagerInternal.class); + mActivityManager = + (ActivityManager) getContext().getSystemService(Context.ACTIVITY_SERVICE); mAudioPlayerStateMonitor = AudioPlayerStateMonitor.getInstance(); mAudioPlayerStateMonitor.registerListener( (config, isRemoved) -> { @@ -407,7 +415,7 @@ public class MediaSessionService extends SystemService implements Monitor { } try { - session.getCallback().getBinder().unlinkToDeath(session, 0); + session.getCallback().asBinder().unlinkToDeath(session, 0); } catch (Exception e) { // ignore exceptions while destroying a session. } @@ -493,7 +501,7 @@ public class MediaSessionService extends SystemService implements Monitor { } private MediaSessionRecord createSessionInternal(int callerPid, int callerUid, int userId, - String callerPackageName, SessionCallbackLink cb, String tag) throws RemoteException { + String callerPackageName, ISessionCallback cb, String tag) throws RemoteException { synchronized (mLock) { return createSessionLocked(callerPid, callerUid, userId, callerPackageName, cb, tag); } @@ -507,7 +515,7 @@ public class MediaSessionService extends SystemService implements Monitor { * 4. It needs to be added to the relevant user record. */ private MediaSessionRecord createSessionLocked(int callerPid, int callerUid, int userId, - String callerPackageName, SessionCallbackLink cb, String tag) { + String callerPackageName, ISessionCallback cb, String tag) { FullUserRecord user = getFullUserRecordLocked(userId); if (user == null) { Log.wtf(TAG, "Request from invalid user: " + userId); @@ -517,7 +525,7 @@ public class MediaSessionService extends SystemService implements Monitor { final MediaSessionRecord session = new MediaSessionRecord(callerPid, callerUid, userId, callerPackageName, cb, tag, this, mHandler.getLooper()); try { - cb.getBinder().linkToDeath(session, 0); + cb.asBinder().linkToDeath(session, 0); } catch (RemoteException e) { throw new RuntimeException("Media Session owner died prematurely.", e); } @@ -868,7 +876,7 @@ public class MediaSessionService extends SystemService implements Monitor { private boolean mVoiceButtonHandled = false; @Override - public ISession createSession(String packageName, SessionCallbackLink cb, String tag, + public ISession createSession(String packageName, ISessionCallback cb, String tag, int userId) throws RemoteException { final int pid = Binder.getCallingPid(); final int uid = Binder.getCallingUid(); @@ -888,6 +896,21 @@ public class MediaSessionService extends SystemService implements Monitor { } @Override + public void notifySession2Created(Session2Token sessionToken) throws RemoteException { + final int pid = Binder.getCallingPid(); + final int uid = Binder.getCallingUid(); + final long token = Binder.clearCallingIdentity(); + try { + if (DEBUG) { + Log.d(TAG, "Session2 is created " + sessionToken); + } + // TODO: Keep the session. + } finally { + Binder.restoreCallingIdentity(token); + } + } + + @Override public List<IBinder> getSessions(ComponentName componentName, int userId) { final int pid = Binder.getCallingPid(); final int uid = Binder.getCallingUid(); @@ -1202,7 +1225,8 @@ public class MediaSessionService extends SystemService implements Monitor { * there's no active global priority session, long-pressess will be sent to the * long-press listener instead of adjusting volume. * - * @param packageName The caller package. + * @param packageName The caller's package name, obtained by Context#getPackageName() + * @param opPackageName The caller's op package name, obtained by Context#getOpPackageName() * @param asSystemService {@code true} if the event sent to the session as if it was come * from the system service instead of the app process. This helps sessions to * distinguish between the key injection by the app and key events from the @@ -1217,8 +1241,8 @@ public class MediaSessionService extends SystemService implements Monitor { * @param musicOnly true if both UI nor haptic feedback aren't needed when adjust volume. */ @Override - public void dispatchVolumeKeyEvent(String packageName, boolean asSystemService, - KeyEvent keyEvent, int stream, boolean musicOnly) { + public void dispatchVolumeKeyEvent(String packageName, String opPackageName, + boolean asSystemService, KeyEvent keyEvent, int stream, boolean musicOnly) { if (keyEvent == null || (keyEvent.getKeyCode() != KeyEvent.KEYCODE_VOLUME_UP && keyEvent.getKeyCode() != KeyEvent.KEYCODE_VOLUME_DOWN @@ -1240,8 +1264,8 @@ public class MediaSessionService extends SystemService implements Monitor { synchronized (mLock) { if (isGlobalPriorityActiveLocked() || mCurrentFullUserRecord.mOnVolumeKeyLongPressListener == null) { - dispatchVolumeKeyEventLocked(packageName, pid, uid, asSystemService, - keyEvent, stream, musicOnly); + dispatchVolumeKeyEventLocked(packageName, opPackageName, pid, uid, + asSystemService, keyEvent, stream, musicOnly); } else { // TODO: Consider the case when both volume up and down keys are pressed // at the same time. @@ -1274,12 +1298,13 @@ public class MediaSessionService extends SystemService implements Monitor { && mCurrentFullUserRecord.mInitialDownVolumeKeyEvent .getDownTime() == keyEvent.getDownTime()) { // Short-press. Should change volume. - dispatchVolumeKeyEventLocked(packageName, pid, uid, asSystemService, + dispatchVolumeKeyEventLocked(packageName, opPackageName, pid, uid, + asSystemService, mCurrentFullUserRecord.mInitialDownVolumeKeyEvent, mCurrentFullUserRecord.mInitialDownVolumeStream, mCurrentFullUserRecord.mInitialDownMusicOnly); - dispatchVolumeKeyEventLocked(packageName, pid, uid, asSystemService, - keyEvent, stream, musicOnly); + dispatchVolumeKeyEventLocked(packageName, opPackageName, pid, uid, + asSystemService, keyEvent, stream, musicOnly); } else { dispatchVolumeKeyLongPressLocked(keyEvent); } @@ -1291,8 +1316,9 @@ public class MediaSessionService extends SystemService implements Monitor { } } - private void dispatchVolumeKeyEventLocked(String packageName, int pid, int uid, - boolean asSystemService, KeyEvent keyEvent, int stream, boolean musicOnly) { + private void dispatchVolumeKeyEventLocked(String packageName, String opPackageName, int pid, + int uid, boolean asSystemService, KeyEvent keyEvent, int stream, + boolean musicOnly) { boolean down = keyEvent.getAction() == KeyEvent.ACTION_DOWN; boolean up = keyEvent.getAction() == KeyEvent.ACTION_UP; int direction = 0; @@ -1326,26 +1352,26 @@ public class MediaSessionService extends SystemService implements Monitor { if (up) { direction = 0; } - dispatchAdjustVolumeLocked(packageName, pid, uid, asSystemService, stream, - direction, flags); + dispatchAdjustVolumeLocked(packageName, opPackageName, pid, uid, + asSystemService, stream, direction, flags); } else if (isMute) { if (down && keyEvent.getRepeatCount() == 0) { - dispatchAdjustVolumeLocked(packageName, pid, uid, asSystemService, stream, - AudioManager.ADJUST_TOGGLE_MUTE, flags); + dispatchAdjustVolumeLocked(packageName, opPackageName, pid, uid, + asSystemService, stream, AudioManager.ADJUST_TOGGLE_MUTE, flags); } } } } @Override - public void dispatchAdjustVolume(String packageName, int suggestedStream, int delta, - int flags) { + public void dispatchAdjustVolume(String packageName, String opPackageName, + int suggestedStream, int delta, int flags) { final int pid = Binder.getCallingPid(); final int uid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); try { synchronized (mLock) { - dispatchAdjustVolumeLocked(packageName, pid, uid, false, + dispatchAdjustVolumeLocked(packageName, opPackageName, pid, uid, false, suggestedStream, delta, flags); } } finally { @@ -1409,24 +1435,14 @@ public class MediaSessionService extends SystemService implements Monitor { final int uid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); try { - int controllerUserId = UserHandle.getUserId(controllerUid); - int controllerUidFromPackageName; - try { - controllerUidFromPackageName = getContext().getPackageManager() - .getPackageUidAsUser(controllerPackageName, controllerUserId); - } catch (NameNotFoundException e) { - if (DEBUG) { - Log.d(TAG, "Package " + controllerPackageName + " doesn't exist"); - } - return false; - } - if (controllerUidFromPackageName != controllerUid) { - if (DEBUG) { - Log.d(TAG, "Package name " + controllerPackageName - + " doesn't match with the uid " + controllerUid); - } - return false; - } + // Don't perform sanity check between controllerPackageName and controllerUid. + // When an (activity|service) runs on the another apps process by specifying + // android:process in the AndroidManifest.xml, then PID and UID would have the + // running process' information instead of the (activity|service) that has created + // MediaController. + // Note that we can use Context#getOpPackageName() instead of + // Context#getPackageName() for getting package name that matches with the PID/UID, + // but it doesn't tell which package has created the MediaController, so useless. return hasMediaControlPermission(UserHandle.getUserId(uid), controllerPackageName, controllerPid, controllerUid); } finally { @@ -1497,8 +1513,8 @@ public class MediaSessionService extends SystemService implements Monitor { return false; } - private void dispatchAdjustVolumeLocked(String packageName, int pid, int uid, - boolean asSystemService, int suggestedStream, int direction, int flags) { + private void dispatchAdjustVolumeLocked(String packageName, String opPackageName, int pid, + int uid, boolean asSystemService, int suggestedStream, int direction, int flags) { MediaSessionRecord session = isGlobalPriorityActiveLocked() ? mGlobalPrioritySession : mCurrentFullUserRecord.mPriorityStack.getDefaultVolumeSession(); @@ -1529,21 +1545,28 @@ public class MediaSessionService extends SystemService implements Monitor { mHandler.post(new Runnable() { @Override public void run() { + final String callingOpPackageName; + final int callingUid; + if (asSystemService) { + callingOpPackageName = getContext().getOpPackageName(); + callingUid = Process.myUid(); + } else { + callingOpPackageName = opPackageName; + callingUid = uid; + } try { - String packageName = getContext().getOpPackageName(); - mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream, - flags, packageName, TAG); - } catch (RemoteException|SecurityException e) { - Log.e(TAG, "Error adjusting default volume.", e); - } catch (IllegalArgumentException e) { + mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(suggestedStream, + direction, flags, callingOpPackageName, callingUid); + } catch (SecurityException | IllegalArgumentException e) { Log.e(TAG, "Cannot adjust volume: direction=" + direction - + ", suggestedStream=" + suggestedStream + ", flags=" + flags, - e); + + ", suggestedStream=" + suggestedStream + ", flags=" + flags + + ", packageName=" + packageName + ", uid=" + uid + + ", asSystemService=" + asSystemService, e); } } }); } else { - session.adjustVolume(packageName, pid, uid, null, asSystemService, + session.adjustVolume(packageName, opPackageName, pid, uid, null, asSystemService, direction, flags, true); } } diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 0d6dadfb1ad8..af55605975ca 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -270,14 +270,12 @@ import java.util.concurrent.TimeUnit; * enforcement. * * <p> - * This class uses 2-3 locks to synchronize state: + * This class uses 2 locks to synchronize state: * <ul> * <li>{@code mUidRulesFirstLock}: used to guard state related to individual UIDs (such as firewall * rules). * <li>{@code mNetworkPoliciesSecondLock}: used to guard state related to network interfaces (such * as network policies). - * <li>{@code allLocks}: not a "real" lock, but an indication (through @GuardedBy) that all locks - * must be held. * </ul> * * <p> @@ -419,7 +417,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final Object mUidRulesFirstLock = new Object(); final Object mNetworkPoliciesSecondLock = new Object(); - @GuardedBy("allLocks") volatile boolean mSystemReady; + @GuardedBy({"mUidRulesFirstLock", "mNetworkPoliciesSecondLock"}) + volatile boolean mSystemReady; @GuardedBy("mUidRulesFirstLock") volatile boolean mRestrictBackground; @GuardedBy("mUidRulesFirstLock") volatile boolean mRestrictPower; @@ -558,7 +557,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { private final ServiceThread mUidEventThread; - @GuardedBy("allLocks") + @GuardedBy({"mUidRulesFirstLock", "mNetworkPoliciesSecondLock"}) private final AtomicFile mPolicyFile; private final AppOpsManager mAppOps; diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 6187583a0253..88d73fb10902 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -558,7 +558,7 @@ abstract public class ManagedServices { if (pkgList != null && (pkgList.length > 0)) { boolean anyServicesInvolved = false; // Remove notification settings for uninstalled package - if (removingPackage) { + if (removingPackage && uidList != null) { int size = Math.min(pkgList.length, uidList.length); for (int i = 0; i < size; i++) { final String pkg = pkgList[i]; @@ -570,9 +570,11 @@ abstract public class ManagedServices { if (mEnabledServicesPackageNames.contains(pkgName)) { anyServicesInvolved = true; } - for (int uid : uidList) { - if (isPackageAllowed(pkgName, UserHandle.getUserId(uid))) { - anyServicesInvolved = true; + if (uidList != null && uidList.length > 0) { + for (int uid : uidList) { + if (isPackageAllowed(pkgName, UserHandle.getUserId(uid))) { + anyServicesInvolved = true; + } } } } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 85a8d938d693..4f21db159625 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -75,6 +75,8 @@ import static android.service.notification.NotificationListenerService.TRIM_FULL import static android.service.notification.NotificationListenerService.TRIM_LIGHT; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; +import static com.android.server.am.PendingIntentRecord.FLAG_ACTIVITY_SENDER; +import static com.android.server.am.PendingIntentRecord.FLAG_BROADCAST_SENDER; import static com.android.server.utils.PriorityDump.PRIORITY_ARG; import static com.android.server.utils.PriorityDump.PRIORITY_ARG_CRITICAL; import static com.android.server.utils.PriorityDump.PRIORITY_ARG_NORMAL; @@ -763,8 +765,7 @@ public class NotificationManagerService extends SystemService { .addTaggedData(MetricsEvent.NOTIFICATION_SHADE_INDEX, nv.rank) .addTaggedData(MetricsEvent.NOTIFICATION_SHADE_COUNT, nv.count) .addTaggedData(MetricsEvent.NOTIFICATION_ACTION_IS_SMART, - (Notification.Action.SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION - == action.getSemanticAction()) ? 1 : 0) + action.isContextual() ? 1 : 0) .addTaggedData( MetricsEvent.NOTIFICATION_SMART_SUGGESTION_ASSISTANT_GENERATED, generatedByAssistant ? 1 : 0)); @@ -968,7 +969,7 @@ public class NotificationManagerService extends SystemService { r.getNumSmartActionsAdded()) .addTaggedData( MetricsEvent.NOTIFICATION_SMART_SUGGESTION_ASSISTANT_GENERATED, - r.getSuggestionsGeneratedByAssistant()); + r.getSuggestionsGeneratedByAssistant() ? 1 : 0); mMetricsLogger.write(logMaker); } } @@ -1314,6 +1315,11 @@ public class NotificationManagerService extends SystemService { } @VisibleForTesting + void setHints(int hints) { + mListenerHints = hints; + } + + @VisibleForTesting void setVibrator(Vibrator vibrator) { mVibrator = vibrator; } @@ -2635,6 +2641,9 @@ public class NotificationManagerService extends SystemService { // Zen mConditionProviders.onPackagesChanged(true, packages, uids); + // Snoozing + mSnoozeHelper.clearData(UserHandle.getUserId(uid), packageName); + // Reset notification preferences if (!fromApp) { mPreferencesHelper.onPackagesChanged( @@ -3990,6 +3999,20 @@ public class NotificationManagerService extends SystemService { if ((mListenerHints & HINT_HOST_DISABLE_EFFECTS) != 0) { return "listenerHints"; } + if (record != null && record.getAudioAttributes() != null) { + if ((mListenerHints & HINT_HOST_DISABLE_NOTIFICATION_EFFECTS) != 0) { + if (record.getAudioAttributes().getUsage() + != AudioAttributes.USAGE_VOICE_COMMUNICATION) { + return "listenerNoti"; + } + } + if ((mListenerHints & HINT_HOST_DISABLE_CALL_EFFECTS) != 0) { + if (record.getAudioAttributes().getUsage() + == AudioAttributes.USAGE_VOICE_COMMUNICATION) { + return "listenerCall"; + } + } + } if (mCallState != TelephonyManager.CALL_STATE_IDLE && !mZenModeHelper.isCall(record)) { return "callState"; } @@ -4420,6 +4443,8 @@ public class NotificationManagerService extends SystemService { if (pendingIntent != null) { am.setPendingIntentWhitelistDuration(pendingIntent.getTarget(), WHITELIST_TOKEN, duration); + am.setPendingIntentAllowBgActivityStarts(pendingIntent.getTarget(), + WHITELIST_TOKEN, (FLAG_ACTIVITY_SENDER | FLAG_BROADCAST_SENDER)); } } } @@ -5675,19 +5700,17 @@ public class NotificationManagerService extends SystemService { } int indexBefore = findNotificationRecordIndexLocked(record); boolean interceptBefore = record.isIntercepted(); - float contactAffinityBefore = record.getContactAffinity(); int visibilityBefore = record.getPackageVisibilityOverride(); recon.applyChangesLocked(record); applyZenModeLocked(record); mRankingHelper.sort(mNotificationList); int indexAfter = findNotificationRecordIndexLocked(record); boolean interceptAfter = record.isIntercepted(); - float contactAffinityAfter = record.getContactAffinity(); int visibilityAfter = record.getPackageVisibilityOverride(); changed = indexBefore != indexAfter || interceptBefore != interceptAfter || visibilityBefore != visibilityAfter; if (interceptBefore && !interceptAfter - && Float.compare(contactAffinityBefore, contactAffinityAfter) != 0) { + && record.isNewEnoughForAlerting(System.currentTimeMillis())) { buzzBeepBlinkLocked(record); } } diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index e2c64ca459a8..9942f5920c9e 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -92,6 +92,8 @@ public final class NotificationRecord { static final String TAG = "NotificationRecord"; static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG); private static final int MAX_LOGTAG_LENGTH = 35; + // the period after which a notification is updated where it can make sound + private static final int MAX_SOUND_DELAY_MS = 2000; final StatusBarNotification sbn; IActivityManager mAm; UriGrantsManagerInternal mUgmInternal; @@ -125,7 +127,8 @@ public final class NotificationRecord { private long mVisibleSinceMs; // The most recent update time, or the creation time if no updates. - private long mUpdateTimeMs; + @VisibleForTesting + final long mUpdateTimeMs; // The most recent interruption time, or the creation time if no updates. Differs from the // above value because updates are filtered based on whether they actually interrupted the @@ -165,7 +168,7 @@ public final class NotificationRecord { private String mChannelIdLogTag; /** * This list contains system generated smart actions from NAS, app-generated smart actions are - * stored in Notification.actions marked as SEMANTIC_ACTION_CONTEXTUAL_SUGGESTION. + * stored in Notification.actions with isContextual() set to true. */ private ArrayList<Notification.Action> mSystemGeneratedSmartActions; private ArrayList<CharSequence> mSmartReplies; @@ -826,6 +829,10 @@ public final class NotificationRecord { return mIntercept; } + public boolean isNewEnoughForAlerting(long now) { + return getFreshnessMs(now) <= MAX_SOUND_DELAY_MS; + } + public void setHidden(boolean hidden) { mHidden = hidden; } diff --git a/services/core/java/com/android/server/notification/SnoozeHelper.java b/services/core/java/com/android/server/notification/SnoozeHelper.java index 2b581d601ad5..abc98412e126 100644 --- a/services/core/java/com/android/server/notification/SnoozeHelper.java +++ b/services/core/java/com/android/server/notification/SnoozeHelper.java @@ -17,6 +17,7 @@ package com.android.server.notification; import android.annotation.NonNull; import android.app.AlarmManager; +import android.app.Notification; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -163,7 +164,6 @@ public class SnoozeHelper { mSnoozedNotifications.get(userId).get(pkg); if (recordsForPkg != null) { final Set<Map.Entry<String, NotificationRecord>> records = recordsForPkg.entrySet(); - String key = null; for (Map.Entry<String, NotificationRecord> record : records) { final StatusBarNotification sbn = record.getValue().sbn; if (Objects.equals(sbn.getTag(), tag) && sbn.getId() == id) { @@ -305,6 +305,30 @@ public class SnoozeHelper { } } + protected void clearData(int userId, String pkg) { + ArrayMap<String, ArrayMap<String, NotificationRecord>> records = + mSnoozedNotifications.get(userId); + if (records == null) { + return; + } + ArrayMap<String, NotificationRecord> pkgRecords = records.get(pkg); + if (pkgRecords == null) { + return; + } + for (int i = pkgRecords.size() - 1; i >= 0; i--) { + final NotificationRecord r = pkgRecords.removeAt(i); + if (r != null) { + mPackages.remove(r.getKey()); + mUsers.remove(r.getKey()); + final PendingIntent pi = createPendingIntent(pkg, r.getKey(), userId); + mAm.cancel(pi); + MetricsLogger.action(r.getLogMaker() + .setCategory(MetricsProto.MetricsEvent.NOTIFICATION_SNOOZED) + .setType(MetricsProto.MetricsEvent.TYPE_DISMISS)); + } + } + } + private PendingIntent createPendingIntent(String pkg, String key, int userId) { return PendingIntent.getBroadcast(mContext, REQUEST_CODE_REPOST, diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 66eae5e42378..7ca39df39bb7 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -209,8 +209,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements synchronized (mSessions) { readSessionsLocked(); - reconcileStagesLocked(StorageManager.UUID_PRIVATE_INTERNAL, false /*isInstant*/); - reconcileStagesLocked(StorageManager.UUID_PRIVATE_INTERNAL, true /*isInstant*/); + reconcileStagesLocked(StorageManager.UUID_PRIVATE_INTERNAL); final ArraySet<File> unclaimedIcons = newArraySet( mSessionsDir.listFiles()); @@ -230,8 +229,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements } @GuardedBy("mSessions") - private void reconcileStagesLocked(String volumeUuid, boolean isEphemeral) { - final File stagingDir = buildStagingDir(volumeUuid, isEphemeral); + private void reconcileStagesLocked(String volumeUuid) { + final File stagingDir = getTmpSessionDir(volumeUuid); final ArraySet<File> unclaimedStages = newArraySet( stagingDir.listFiles(sStageFilter)); @@ -252,7 +251,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements public void onPrivateVolumeMounted(String volumeUuid) { synchronized (mSessions) { - reconcileStagesLocked(volumeUuid, false /*isInstant*/); + reconcileStagesLocked(volumeUuid); } } @@ -269,9 +268,9 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements try { final int sessionId = allocateSessionIdLocked(); mLegacySessions.put(sessionId, true); - final File stageDir = buildStageDir(volumeUuid, sessionId, isEphemeral); - prepareStageDir(stageDir); - return stageDir; + final File sessionStageDir = buildTmpSessionDir(sessionId, volumeUuid); + prepareStageDir(sessionStageDir); + return sessionStageDir; } catch (IllegalStateException e) { throw new IOException(e); } @@ -526,9 +525,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements String stageCid = null; if (!params.isMultiPackage) { if ((params.installFlags & PackageManager.INSTALL_INTERNAL) != 0) { - final boolean isInstant = - (params.installFlags & PackageManager.INSTALL_INSTANT_APP) != 0; - stageDir = buildStageDir(params.volumeUuid, sessionId, isInstant); + stageDir = buildSessionDir(sessionId, params); } else { stageCid = buildExternalStageCid(sessionId); } @@ -634,13 +631,21 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements throw new IllegalStateException("Failed to allocate session ID"); } - private File buildStagingDir(String volumeUuid, boolean isEphemeral) { + private File getTmpSessionDir(String volumeUuid) { return Environment.getDataAppDirectory(volumeUuid); } - private File buildStageDir(String volumeUuid, int sessionId, boolean isEphemeral) { - final File stagingDir = buildStagingDir(volumeUuid, isEphemeral); - return new File(stagingDir, "vmdl" + sessionId + ".tmp"); + private File buildTmpSessionDir(int sessionId, String volumeUuid) { + final File sessionStagingDir = getTmpSessionDir(volumeUuid); + return new File(sessionStagingDir, "vmdl" + sessionId + ".tmp"); + } + + private File buildSessionDir(int sessionId, SessionParams params) { + if (params.isStaged) { + final File sessionStagingDir = Environment.getDataStagingDirectory(params.volumeUuid); + return new File(sessionStagingDir, "session_" + sessionId); + } + return buildTmpSessionDir(sessionId, params.volumeUuid); } static void prepareStageDir(File stageDir) throws IOException { diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index d290f3f34909..982daa5df2d5 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -17,6 +17,7 @@ package com.android.server.pm; import static android.content.pm.PackageManager.INSTALL_FAILED_ABORTED; +import static android.content.pm.PackageManager.INSTALL_FAILED_BAD_SIGNATURE; import static android.content.pm.PackageManager.INSTALL_FAILED_CONTAINER_ERROR; import static android.content.pm.PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE; import static android.content.pm.PackageManager.INSTALL_FAILED_INTERNAL_ERROR; @@ -106,6 +107,7 @@ import com.android.server.LocalServices; import com.android.server.pm.Installer.InstallerException; import com.android.server.pm.PackageInstallerService.PackageInstallObserverAdapter; import com.android.server.pm.dex.DexManager; +import com.android.server.security.VerityUtils; import libcore.io.IoUtils; @@ -285,6 +287,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { private final List<String> mResolvedNativeLibPaths = new ArrayList<>(); @GuardedBy("mLock") private File mInheritedFilesBase; + @GuardedBy("mLock") + private boolean mVerityFound; private static final FileFilter sAddedFilter = new FileFilter() { @Override @@ -294,6 +298,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { if (file.isDirectory()) return false; if (file.getName().endsWith(REMOVE_SPLIT_MARKER_EXTENSION)) return false; if (DexMetadataHelper.isDexMetadataFile(file)) return false; + if (VerityUtils.isFsveritySignatureFile(file)) return false; return true; } }; @@ -978,18 +983,18 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { // Read transfers from the original owner stay open, but as the session's data // cannot be modified anymore, there is no leak of information. - if (!params.isMultiPackage) { + // For staged sessions, the validation is performed by StagingManager. + if (!params.isMultiPackage && !params.isStaged) { final PackageInfo pkgInfo = mPm.getPackageInfo( params.appPackageName, PackageManager.GET_SIGNATURES | PackageManager.MATCH_STATIC_SHARED_LIBRARIES /*flags*/, userId); resolveStageDirLocked(); - // Verify that stage looks sane with respect to existing application. - // This currently only ensures packageName, versionCode, and certificate - // consistency. try { if ((params.installFlags & PackageManager.INSTALL_APEX) != 0) { + // TODO(b/118865310): Remove this when APEX validation is done via + // StagingManager. validateApexInstallLocked(pkgInfo); } else { // Verify that stage looks sane with respect to existing application. @@ -1062,16 +1067,17 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { @GuardedBy("mLock") private void commitLocked() throws PackageManagerException { + if (params.isStaged) { + mStagingManager.commitSession(this); + destroyInternal(); + dispatchSessionFinished(PackageManager.INSTALL_SUCCEEDED, "Session staged", null); + return; + } final PackageManagerService.ActiveInstallSession committingSession = makeSessionActiveLocked(); if (committingSession == null) { return; } - if (isStaged()) { - mStagingManager.commitSession(this); - dispatchSessionFinished(PackageManager.INSTALL_SUCCEEDED, "Session staged", null); - return; - } if (isMultiPackage()) { final int[] childSessionIds = getChildSessionIds(); List<PackageManagerService.ActiveInstallSession> childSessions = @@ -1361,6 +1367,16 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { mResolvedStagedFiles.clear(); mResolvedInheritedFiles.clear(); + // Partial installs must be consistent with existing install + if (params.mode == SessionParams.MODE_INHERIT_EXISTING + && (pkgInfo == null || pkgInfo.applicationInfo == null)) { + throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, + "Missing existing base package"); + } + // Default to require only if existing base has fs-verity. + mVerityFound = params.mode == SessionParams.MODE_INHERIT_EXISTING + && VerityUtils.hasFsverity(pkgInfo.applicationInfo.getBaseCodePath()); + try { resolveStageDirLocked(); } catch (IOException e) { @@ -1424,7 +1440,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } final File targetFile = new File(mResolvedStageDir, targetName); - maybeRenameFile(addedFile, targetFile); + resolveAndStageFile(addedFile, targetFile); // Base is coming from session if (apk.splitName == null) { @@ -1432,8 +1448,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { baseApk = apk; } - mResolvedStagedFiles.add(targetFile); - final File dexMetadataFile = DexMetadataHelper.findDexMetadataForFile(addedFile); if (dexMetadataFile != null) { if (!FileUtils.isValidExtFilename(dexMetadataFile.getName())) { @@ -1442,8 +1456,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } final File targetDexMetadataFile = new File(mResolvedStageDir, DexMetadataHelper.buildDexMetadataPathForApk(targetName)); - mResolvedStagedFiles.add(targetDexMetadataFile); - maybeRenameFile(dexMetadataFile, targetDexMetadataFile); + resolveAndStageFile(dexMetadataFile, targetDexMetadataFile); } } @@ -1486,12 +1499,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } else { - // Partial installs must be consistent with existing install - if (pkgInfo == null || pkgInfo.applicationInfo == null) { - throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, - "Missing existing base package for " + mPackageName); - } - final PackageLite existing; final ApkLite existingBase; ApplicationInfo appInfo = pkgInfo.applicationInfo; @@ -1611,6 +1618,39 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } + private void resolveAndStageFile(File origFile, File targetFile) + throws PackageManagerException { + mResolvedStagedFiles.add(targetFile); + maybeRenameFile(origFile, targetFile); + + final File originalSignature = new File( + VerityUtils.getFsveritySignatureFilePath(origFile.getPath())); + // Make sure .fsv_sig exists when it should, then resolve and stage it. + if (originalSignature.exists()) { + // mVerityFound can only change from false to true here during the staging loop. Since + // all or none of files should have .fsv_sig, this should only happen in the first time + // (or never), otherwise bail out. + if (!mVerityFound) { + mVerityFound = true; + if (mResolvedStagedFiles.size() > 1) { + throw new PackageManagerException(INSTALL_FAILED_BAD_SIGNATURE, + "Some file is missing fs-verity signature"); + } + } + } else { + if (!mVerityFound) { + return; + } + throw new PackageManagerException(INSTALL_FAILED_BAD_SIGNATURE, + "Missing corresponding fs-verity signature to " + origFile); + } + + final File stagedSignature = new File( + VerityUtils.getFsveritySignatureFilePath(targetFile.getPath())); + maybeRenameFile(originalSignature, stagedSignature); + mResolvedStagedFiles.add(stagedSignature); + } + @GuardedBy("mLock") private void assertApkConsistentLocked(String tag, ApkLite apk) throws PackageManagerException { @@ -1984,7 +2024,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { bridge.forceClose(); } } - if (stageDir != null) { + // For staged sessions, we don't delete the directory where the packages have been copied, + // since these packages are supposed to be read on reboot. StagingManager is in charge of + // deleting these dirs when the staged session has reached a final state. + // TODO(b/118865310): Implement packageDir deletion in StagingManager. + if (stageDir != null && !params.isStaged) { try { mPm.mInstaller.rmPackageDir(stageDir.getAbsolutePath()); } catch (InstallerException ignored) { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 136c7c91749e..fe89be6f73c4 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -8549,16 +8549,16 @@ public class PackageManagerService extends IPackageManager.Stub } /** - * Returns if full apk verification can be skipped for the whole package, including the splits. + * Returns if forced apk verification can be skipped for the whole package, including splits. */ - private boolean canSkipFullPackageVerification(PackageParser.Package pkg) { - if (!canSkipFullApkVerification(pkg.baseCodePath)) { + private boolean canSkipForcedPackageVerification(PackageParser.Package pkg) { + if (!canSkipForcedApkVerification(pkg.baseCodePath)) { return false; } // TODO: Allow base and splits to be verified individually. if (!ArrayUtils.isEmpty(pkg.splitCodePaths)) { for (int i = 0; i < pkg.splitCodePaths.length; i++) { - if (!canSkipFullApkVerification(pkg.splitCodePaths[i])) { + if (!canSkipForcedApkVerification(pkg.splitCodePaths[i])) { return false; } } @@ -8567,14 +8567,17 @@ public class PackageManagerService extends IPackageManager.Stub } /** - * Returns if full apk verification can be skipped, depending on current FSVerity setup and + * Returns if forced apk verification can be skipped, depending on current FSVerity setup and * whether the apk contains signed root hash. Note that the signer's certificate still needs to * match one in a trusted source, and should be done separately. */ - private boolean canSkipFullApkVerification(String apkPath) { - final byte[] rootHashObserved; + private boolean canSkipForcedApkVerification(String apkPath) { + if (!PackageManagerServiceUtils.isLegacyApkVerityMode()) { + return VerityUtils.hasFsverity(apkPath); + } + try { - rootHashObserved = VerityUtils.generateApkVerityRootHash(apkPath); + final byte[] rootHashObserved = VerityUtils.generateApkVerityRootHash(apkPath); if (rootHashObserved == null) { return false; // APK does not contain Merkle tree root hash. } @@ -8746,7 +8749,7 @@ public class PackageManagerService extends IPackageManager.Stub // in verified partition, or can be verified on access (when apk verity is enabled). In both // cases, only data in Signing Block is verified instead of the whole file. final boolean skipVerify = scanSystemPartition - || (forceCollect && canSkipFullPackageVerification(pkg)); + || (forceCollect && canSkipForcedPackageVerification(pkg)); collectCertificatesLI(pkgSetting, pkg, forceCollect, skipVerify); // Reset profile if the application version is changed @@ -16552,44 +16555,11 @@ public class PackageManagerService extends IPackageManager.Stub throw new PrepareFailure(INSTALL_FAILED_INSUFFICIENT_STORAGE, "Failed rename"); } - if (PackageManagerServiceUtils.isApkVerityEnabled()) { - String apkPath = null; - synchronized (mPackages) { - // Note that if the attacker managed to skip verify setup, for example by tampering - // with the package settings, upon reboot we will do full apk verification when - // verity is not detected. - final PackageSetting ps = mSettings.mPackages.get(pkgName); - if (ps != null && ps.isPrivileged()) { - apkPath = pkg.baseCodePath; - } - } - if (apkPath != null) { - final VerityUtils.SetupResult result = - VerityUtils.generateApkVeritySetupData(apkPath, null /* signaturePath */, - true /* skipSigningBlock */); - if (result.isOk()) { - if (Build.IS_DEBUGGABLE) Slog.i(TAG, "Enabling apk verity to " + apkPath); - FileDescriptor fd = result.getUnownedFileDescriptor(); - try { - final byte[] signedRootHash = - VerityUtils.generateApkVerityRootHash(apkPath); - mInstaller.installApkVerity(apkPath, fd, result.getContentSize()); - mInstaller.assertFsverityRootHashMatches(apkPath, signedRootHash); - } catch (InstallerException | IOException | DigestException | - NoSuchAlgorithmException e) { - throw new PrepareFailure(INSTALL_FAILED_INTERNAL_ERROR, - "Failed to set up verity: " + e); - } finally { - IoUtils.closeQuietly(fd); - } - } else if (result.isFailed()) { - throw new PrepareFailure(INSTALL_FAILED_INTERNAL_ERROR, - "Failed to generate verity"); - } else { - // Do nothing if verity is skipped. Will fall back to full apk verification on - // reboot. - } - } + try { + setUpFsVerityIfPossible(pkg); + } catch (InstallerException | IOException | DigestException | NoSuchAlgorithmException e) { + throw new PrepareFailure(INSTALL_FAILED_INTERNAL_ERROR, + "Failed to set up verity: " + e); } if (!instantApp) { @@ -16887,6 +16857,85 @@ public class PackageManagerService extends IPackageManager.Stub } } + /** + * Set up fs-verity for the given package if possible. This requires a feature flag of system + * property to be enabled only if the kernel supports fs-verity. + * + * <p>When the feature flag is set to legacy mode, only APK is supported (with some experimental + * kernel patches). In normal mode, all file format can be supported. + */ + private void setUpFsVerityIfPossible(PackageParser.Package pkg) throws InstallerException, + PrepareFailure, IOException, DigestException, NoSuchAlgorithmException { + if (!PackageManagerServiceUtils.isApkVerityEnabled()) { + return; + } + final boolean legacyMode = PackageManagerServiceUtils.isLegacyApkVerityMode(); + + // Collect files we care for fs-verity setup. + ArrayMap<String, String> fsverityCandidates = new ArrayMap<>(); + if (legacyMode) { + synchronized (mPackages) { + final PackageSetting ps = mSettings.mPackages.get(pkg.packageName); + if (ps != null && ps.isPrivileged()) { + fsverityCandidates.put(pkg.baseCodePath, null); + if (pkg.splitCodePaths != null) { + for (String splitPath : pkg.splitCodePaths) { + fsverityCandidates.put(splitPath, null); + } + } + } + } + } else { + // NB: These files will become only accessible if the signing key is loaded in kernel's + // .fs-verity keyring. + fsverityCandidates.put(pkg.baseCodePath, + VerityUtils.getFsveritySignatureFilePath(pkg.baseCodePath)); + + final String dmPath = DexMetadataHelper.buildDexMetadataPathForApk(pkg.baseCodePath); + if (new File(dmPath).exists()) { + fsverityCandidates.put(dmPath, VerityUtils.getFsveritySignatureFilePath(dmPath)); + } + + if (pkg.splitCodePaths != null) { + for (String path : pkg.splitCodePaths) { + fsverityCandidates.put(path, VerityUtils.getFsveritySignatureFilePath(path)); + + final String splitDmPath = DexMetadataHelper.buildDexMetadataPathForApk(path); + if (new File(splitDmPath).exists()) { + fsverityCandidates.put(splitDmPath, + VerityUtils.getFsveritySignatureFilePath(splitDmPath)); + } + } + } + } + + for (Map.Entry<String, String> entry : fsverityCandidates.entrySet()) { + final String filePath = entry.getKey(); + final String signaturePath = entry.getValue(); + + final VerityUtils.SetupResult result = VerityUtils.generateApkVeritySetupData( + filePath, signaturePath, legacyMode); + if (result.isOk()) { + if (Build.IS_DEBUGGABLE) Slog.i(TAG, "Enabling verity to " + filePath); + final FileDescriptor fd = result.getUnownedFileDescriptor(); + try { + mInstaller.installApkVerity(filePath, fd, result.getContentSize()); + + // In legacy mode, fs-verity can only be enabled by process with CAP_SYS_ADMIN. + if (legacyMode) { + final byte[] rootHash = VerityUtils.generateApkVerityRootHash(filePath); + mInstaller.assertFsverityRootHashMatches(filePath, rootHash); + } + } finally { + IoUtils.closeQuietly(fd); + } + } else if (result.isFailed()) { + throw new PrepareFailure(PackageManager.INSTALL_FAILED_BAD_SIGNATURE, + "Failed to generate verity"); + } + } + } + private void startIntentFilterVerifications(int userId, boolean replacing, PackageParser.Package pkg) { if (mIntentFilterVerifierComponent == null) { diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index 36948fce4655..25169a24d932 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -543,9 +543,26 @@ public class PackageManagerServiceUtils { } } + /** Default is to not use fs-verity since it depends on kernel support. */ + private static final int FSVERITY_DISABLED = 0; + + /** + * Experimental implementation targeting priv apps, with Android specific kernel patches to + * extend fs-verity. + */ + private static final int FSVERITY_LEGACY = 1; + + /** Standard fs-verity. */ + private static final int FSVERITY_ENABLED = 2; + /** Returns true if APK Verity is enabled. */ static boolean isApkVerityEnabled() { - return SystemProperties.getInt("ro.apk_verity.mode", 0) != 0; + int mode = SystemProperties.getInt("ro.apk_verity.mode", FSVERITY_DISABLED); + return mode == FSVERITY_LEGACY || mode == FSVERITY_ENABLED; + } + + static boolean isLegacyApkVerityMode() { + return SystemProperties.getInt("ro.apk_verity.mode", FSVERITY_DISABLED) == FSVERITY_LEGACY; } /** Returns true to force apk verification if the updated package (in /data) is a priv app. */ diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index ac9c6ef57101..2e9d26a0a0ca 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -2293,6 +2293,9 @@ class PackageManagerShellCommand extends ShellCommand { break; case "--apex": sessionParams.installFlags |= PackageManager.INSTALL_APEX; + // TODO(b/118865310): APEX packages should always imply + // sessionParams.isStaged(). Enforce this when the staged + // install workflow is complete. break; case "--multi-package": sessionParams.setMultiPackage(); @@ -2588,7 +2591,7 @@ class PackageManagerShellCommand extends ShellCommand { try { session = new PackageInstaller.Session( mInterface.getPackageInstaller().openSession(sessionId)); - if (!session.isMultiPackage()) { + if (!session.isMultiPackage() && !session.isStaged()) { // Sanity check that all .dm files match an apk. // (The installer does not support standalone .dm files and will not process them.) try { diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 223f99e5c3f0..3beda6a3f92b 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -19,9 +19,11 @@ package com.android.server.pm; import android.annotation.NonNull; import android.content.pm.PackageInstaller; import android.content.pm.ParceledListSlice; +import android.os.Handler; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; +import com.android.internal.os.BackgroundThread; import java.util.ArrayList; import java.util.List; @@ -35,6 +37,7 @@ public class StagingManager { private static final String TAG = "StagingManager"; private final PackageManagerService mPm; + private final Handler mBgHandler; // STOPSHIP: This is a temporary mock implementation of staged sessions. This variable // shouldn't be needed at all. @@ -44,16 +47,17 @@ public class StagingManager { StagingManager(PackageManagerService pm) { mPm = pm; + mBgHandler = BackgroundThread.getHandler(); } private void updateStoredSession(@NonNull PackageInstallerSession sessionInfo) { synchronized (mStagedSessions) { PackageInstallerSession storedSession = mStagedSessions.get(sessionInfo.sessionId); - if (storedSession == null) { - throw new IllegalStateException("Attempting to change state of a session not " - + "known to StagingManager"); + // storedSession might be null if a call to abortSession was made before the session + // is updated. + if (storedSession != null) { + mStagedSessions.put(sessionInfo.sessionId, sessionInfo); } - mStagedSessions.put(sessionInfo.sessionId, sessionInfo); } } @@ -69,10 +73,13 @@ public class StagingManager { void commitSession(@NonNull PackageInstallerSession sessionInfo) { updateStoredSession(sessionInfo); - // TODO(b/118865310): Dispatch the session to apexd/PackageManager for verification. For - // now we directly mark it as ready. - sessionInfo.setStagedSessionReady(); - mPm.sendSessionUpdatedBroadcast(sessionInfo.generateInfo(), sessionInfo.userId); + + mBgHandler.post(() -> { + // TODO(b/118865310): Dispatch the session to apexd/PackageManager for verification. For + // now we directly mark it as ready. + sessionInfo.setStagedSessionReady(); + mPm.sendSessionUpdatedBroadcast(sessionInfo.generateInfo(), sessionInfo.userId); + }); } void createSession(@NonNull PackageInstallerSession sessionInfo) { diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index f370edf50708..2060aef37044 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -24,6 +24,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMAR import static android.content.Context.CONTEXT_RESTRICTED; import static android.content.Context.DISPLAY_SERVICE; import static android.content.Context.WINDOW_SERVICE; +import static android.content.pm.PackageManager.FEATURE_HDMI_CEC; import static android.content.pm.PackageManager.FEATURE_LEANBACK; import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE; import static android.content.pm.PackageManager.FEATURE_WATCH; @@ -126,6 +127,7 @@ import android.database.ContentObserver; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; import android.hardware.display.DisplayManager; +import android.hardware.hdmi.HdmiAudioSystemClient; import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiPlaybackClient; import android.hardware.hdmi.HdmiPlaybackClient.OneTouchPlayCallback; @@ -195,6 +197,7 @@ import com.android.internal.R; import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; +import com.android.internal.os.RoSystemProperties; import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.IShortcutService; import com.android.internal.policy.PhoneWindow; @@ -373,6 +376,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private ScreenshotHelper mScreenshotHelper; private boolean mHasFeatureWatch; private boolean mHasFeatureLeanback; + private boolean mHasFeatureHdmiCec; // Assigned on main thread, accessed on UI thread volatile VrManagerInternal mVrManagerInternal; @@ -844,7 +848,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } private void interceptBackKeyDown() { - MetricsLogger.count(mContext, "key_back_down", 1); + mLogger.count("key_back_down", 1); // Reset back key state for long press mBackKeyHandled = false; @@ -858,6 +862,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // returns true if the key was handled and should not be passed to the user private boolean interceptBackKeyUp(KeyEvent event) { + mLogger.count("key_back_up", 1); // Cache handled state boolean handled = mBackKeyHandled; @@ -1452,7 +1457,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { */ private HdmiControl getHdmiControl() { if (null == mHdmiControl) { - if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_HDMI_CEC)) { + if (!mHasFeatureHdmiCec) { return null; } HdmiControlManager manager = (HdmiControlManager) mContext.getSystemService( @@ -1688,6 +1693,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mAppOpsManager = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE); mHasFeatureWatch = mContext.getPackageManager().hasSystemFeature(FEATURE_WATCH); mHasFeatureLeanback = mContext.getPackageManager().hasSystemFeature(FEATURE_LEANBACK); + mHasFeatureHdmiCec = mContext.getPackageManager().hasSystemFeature(FEATURE_HDMI_CEC); mAccessibilityShortcutController = new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId); mLogger = new MetricsLogger(); @@ -4115,6 +4121,19 @@ public class PhoneWindowManager implements WindowManagerPolicy { } private void dispatchDirectAudioEvent(KeyEvent event) { + // When System Audio Mode is off, volume keys received by AVR can be either consumed by AVR + // or forwarded to the TV. It's up to Amplifier manufacturer’s implementation. + HdmiControlManager hdmiControlManager = getHdmiControlManager(); + if (null != hdmiControlManager + && !hdmiControlManager.getSystemAudioMode() + && shouldCecAudioDeviceForwardVolumeKeysSystemAudioModeOff()) { + HdmiAudioSystemClient audioSystemClient = hdmiControlManager.getAudioSystemClient(); + if (audioSystemClient != null) { + audioSystemClient.sendKeyEvent( + event.getKeyCode(), event.getAction() == KeyEvent.ACTION_DOWN); + return; + } + } if (event.getAction() != KeyEvent.ACTION_DOWN) { return; } @@ -4122,6 +4141,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { int flags = AudioManager.FLAG_SHOW_UI | AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_FROM_KEY; String pkgName = mContext.getOpPackageName(); + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: try { @@ -4153,6 +4173,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + @Nullable + private HdmiControlManager getHdmiControlManager() { + if (!mHasFeatureHdmiCec) { + return null; + } + return (HdmiControlManager) mContext.getSystemService(HdmiControlManager.class); + } + + private boolean shouldCecAudioDeviceForwardVolumeKeysSystemAudioModeOff() { + return RoSystemProperties.CEC_AUDIO_DEVICE_FORWARD_VOLUME_KEYS_SYSTEM_AUDIO_MODE_OFF; + } + void dispatchMediaKeyWithWakeLock(KeyEvent event) { if (DEBUG_INPUT) { Slog.d(TAG, "dispatchMediaKeyWithWakeLock: " + event); diff --git a/services/core/java/com/android/server/rollback/RollbackManagerService.java b/services/core/java/com/android/server/rollback/RollbackManagerService.java index 5bf204088306..4b5e76497f62 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerService.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerService.java @@ -16,831 +16,27 @@ package com.android.server.rollback; -import android.app.AppOpsManager; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.IIntentReceiver; -import android.content.IIntentSender; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.IntentSender; -import android.content.pm.PackageInfo; -import android.content.pm.PackageInstaller; -import android.content.pm.PackageManager; -import android.content.pm.PackageManagerInternal; -import android.content.pm.PackageParser; -import android.content.pm.ParceledListSlice; -import android.content.pm.StringParceledListSlice; -import android.content.rollback.IRollbackManager; -import android.content.rollback.PackageRollbackInfo; -import android.content.rollback.RollbackInfo; -import android.net.Uri; -import android.os.Binder; -import android.os.Bundle; -import android.os.Environment; -import android.os.Handler; -import android.os.HandlerThread; -import android.os.IBinder; -import android.os.ParcelFileDescriptor; -import android.os.Process; -import android.os.SELinux; -import android.util.Log; -import com.android.internal.annotations.GuardedBy; -import com.android.server.LocalServices; import com.android.server.SystemService; -import com.android.server.pm.PackageManagerServiceUtils; - -import libcore.io.IoUtils; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.nio.file.Files; -import java.time.Instant; -import java.time.format.DateTimeParseException; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; /** - * Service that manages APK level rollbacks. - * - * TODO: Make RollbackManagerService extend SystemService and move the - * IRollbackManager.Stub implementation to a new private - * RollbackManagerServiceImpl class. + * Service that manages APK level rollbacks. Publishes + * Context.ROLLBACK_SERVICE. * * @hide */ -public class RollbackManagerService extends IRollbackManager.Stub { - - private static final String TAG = "RollbackManager"; - - // Rollbacks expire after 48 hours. - // TODO: How to test rollback expiration works properly? - private static final long ROLLBACK_LIFETIME_DURATION_MILLIS = 48 * 60 * 60 * 1000; - - // Lock used to synchronize accesses to in-memory rollback data - // structures. By convention, methods with the suffix "Locked" require - // mLock is held when they are called. - private final Object mLock = new Object(); - - // Package rollback data available to be used for rolling back a package. - // This list is null until the rollback data has been loaded. - @GuardedBy("mLock") - private List<PackageRollbackData> mAvailableRollbacks; - - // The list of recently executed rollbacks. - // This list is null until the rollback data has been loaded. - @GuardedBy("mLock") - private List<RollbackInfo> mRecentlyExecutedRollbacks; - - // Data for available rollbacks and recently executed rollbacks is - // persisted in storage. Assuming the rollback data directory is - // /data/rollback, we use the following directory structure - // to store this data: - // /data/rollback/ - // available/ - // com.package.A-XXX/ - // base.apk - // rollback.json - // com.package.B-YYY/ - // base.apk - // rollback.json - // recently_executed.json - // TODO: Use AtomicFile for rollback.json and recently_executed.json. - private final File mRollbackDataDir; - private final File mAvailableRollbacksDir; - private final File mRecentlyExecutedRollbacksFile; - - private final Context mContext; - private final HandlerThread mHandlerThread; - - RollbackManagerService(Context context) { - mContext = context; - mHandlerThread = new HandlerThread("RollbackManagerServiceHandler"); - mHandlerThread.start(); - - mRollbackDataDir = new File(Environment.getDataDirectory(), "rollback"); - mAvailableRollbacksDir = new File(mRollbackDataDir, "available"); - mRecentlyExecutedRollbacksFile = new File(mRollbackDataDir, "recently_executed.json"); - - // Kick off loading of the rollback data from strorage in a background - // thread. - // TODO: Consider loading the rollback data directly here instead, to - // avoid the need to call ensureRollbackDataLoaded every time before - // accessing the rollback data? - // TODO: Test that this kicks off initial scheduling of rollback - // expiration. - getHandler().post(() -> ensureRollbackDataLoaded()); - - IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_PACKAGE_REPLACED); - filter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED); - filter.addDataScheme("package"); - mContext.registerReceiver(new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - String action = intent.getAction(); - if (Intent.ACTION_PACKAGE_REPLACED.equals(action)) { - String packageName = intent.getData().getSchemeSpecificPart(); - onPackageReplaced(packageName); - } - if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) { - String packageName = intent.getData().getSchemeSpecificPart(); - onPackageFullyRemoved(packageName); - } - } - }, filter, null, getHandler()); - - IntentFilter enableRollbackFilter = new IntentFilter(); - enableRollbackFilter.addAction(Intent.ACTION_PACKAGE_ENABLE_ROLLBACK); - try { - enableRollbackFilter.addDataType("application/vnd.android.package-archive"); - } catch (IntentFilter.MalformedMimeTypeException e) { - Log.e(TAG, "addDataType", e); - } - - mContext.registerReceiver(new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (Intent.ACTION_PACKAGE_ENABLE_ROLLBACK.equals(intent.getAction())) { - int token = intent.getIntExtra( - PackageManagerInternal.EXTRA_ENABLE_ROLLBACK_TOKEN, -1); - int installFlags = intent.getIntExtra( - PackageManagerInternal.EXTRA_ENABLE_ROLLBACK_INSTALL_FLAGS, 0); - File newPackageCodePath = new File(intent.getData().getPath()); - - getHandler().post(() -> { - boolean success = enableRollback(installFlags, newPackageCodePath); - int ret = PackageManagerInternal.ENABLE_ROLLBACK_SUCCEEDED; - if (!success) { - ret = PackageManagerInternal.ENABLE_ROLLBACK_FAILED; - } - - PackageManagerInternal pm = LocalServices.getService( - PackageManagerInternal.class); - pm.setEnableRollbackCode(token, ret); - }); - - // We're handling the ordered broadcast. Abort the - // broadcast because there is no need for it to go to - // anyone else. - abortBroadcast(); - } - } - }, enableRollbackFilter, null, getHandler()); - } - - @Override - public RollbackInfo getAvailableRollback(String packageName) { - PackageRollbackInfo.PackageVersion installedVersion = - getInstalledPackageVersion(packageName); - if (installedVersion == null) { - return null; - } - - synchronized (mLock) { - // TODO: Have ensureRollbackDataLoadedLocked return the list of - // available rollbacks, to hopefully avoid forgetting to call it? - ensureRollbackDataLoadedLocked(); - for (int i = 0; i < mAvailableRollbacks.size(); ++i) { - PackageRollbackData data = mAvailableRollbacks.get(i); - if (data.info.higherVersion.equals(installedVersion)) { - // TODO: For atomic installs, check all dependent packages - // for available rollbacks and include that info here. - return new RollbackInfo(data.info); - } - } - } - - return null; - } - - @Override - public StringParceledListSlice getPackagesWithAvailableRollbacks() { - // TODO: This may return packages whose rollback is out of date or - // expired. Presumably that's okay because the package rollback could - // be expired anyway between when the caller calls this method and - // when the caller calls getAvailableRollback for more details. - final Set<String> packageNames = new HashSet<>(); - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - for (int i = 0; i < mAvailableRollbacks.size(); ++i) { - PackageRollbackData data = mAvailableRollbacks.get(i); - packageNames.add(data.info.packageName); - } - } - return new StringParceledListSlice(new ArrayList<>(packageNames)); - } - - @Override - public ParceledListSlice<RollbackInfo> getRecentlyExecutedRollbacks() { - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - List<RollbackInfo> rollbacks = new ArrayList<>(mRecentlyExecutedRollbacks); - return new ParceledListSlice<>(rollbacks); - } - } - - @Override - public void executeRollback(RollbackInfo rollback, String callerPackageName, - IntentSender statusReceiver) { - final int callingUid = Binder.getCallingUid(); - if ((callingUid != Process.SHELL_UID) && (callingUid != Process.ROOT_UID)) { - AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class); - appOps.checkPackage(callingUid, callerPackageName); - } - - getHandler().post(() -> - executeRollbackInternal(rollback, callerPackageName, statusReceiver)); - } - - /** - * Performs the actual work to execute a rollback. - * The work is done on the current thread. This may be a long running - * operation. - */ - private void executeRollbackInternal(RollbackInfo rollback, - String callerPackageName, IntentSender statusReceiver) { - String packageName = rollback.targetPackage.packageName; - Log.i(TAG, "Initiating rollback of " + packageName); - - PackageRollbackInfo.PackageVersion installedVersion = - getInstalledPackageVersion(packageName); - if (installedVersion == null) { - // TODO: Test this case - sendFailure(statusReceiver, "Target package to roll back is not installed"); - return; - } - - if (!rollback.targetPackage.higherVersion.equals(installedVersion)) { - // TODO: Test this case - sendFailure(statusReceiver, "Target package version to roll back not installed."); - return; - } - - // TODO: We assume that between now and the time we commit the - // downgrade install, the currently installed package version does not - // change. This is not safe to assume, particularly in the case of a - // rollback racing with a roll-forward fix of a buggy package. - // Figure out how to ensure we don't commit the rollback if - // roll forward happens at the same time. - PackageRollbackData data = null; - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - for (int i = 0; i < mAvailableRollbacks.size(); ++i) { - PackageRollbackData available = mAvailableRollbacks.get(i); - // TODO: Check if available.info.lowerVersion matches - // rollback.targetPackage.lowerVersion? - if (available.info.higherVersion.equals(installedVersion)) { - data = available; - break; - } - } - } - - if (data == null) { - sendFailure(statusReceiver, "Rollback not available"); - return; - } - - // Get a context for the caller to use to install the downgraded - // version of the package. - Context context = null; - try { - context = mContext.createPackageContext(callerPackageName, 0); - } catch (PackageManager.NameNotFoundException e) { - sendFailure(statusReceiver, "Invalid callerPackageName"); - return; - } +public final class RollbackManagerService extends SystemService { - PackageManager pm = context.getPackageManager(); - try { - PackageInstaller.Session session = null; + private RollbackManagerServiceImpl mService; - PackageInstaller packageInstaller = pm.getPackageInstaller(); - PackageInstaller.SessionParams params = new PackageInstaller.SessionParams( - PackageInstaller.SessionParams.MODE_FULL_INSTALL); - params.setAllowDowngrade(true); - int sessionId = packageInstaller.createSession(params); - session = packageInstaller.openSession(sessionId); - - // TODO: Will it always be called "base.apk"? What about splits? - File baseApk = new File(data.backupDir, "base.apk"); - try (ParcelFileDescriptor fd = ParcelFileDescriptor.open(baseApk, - ParcelFileDescriptor.MODE_READ_ONLY)) { - final long token = Binder.clearCallingIdentity(); - try { - session.write("base.apk", 0, baseApk.length(), fd); - } finally { - Binder.restoreCallingIdentity(token); - } - } - - final LocalIntentReceiver receiver = new LocalIntentReceiver(); - session.commit(receiver.getIntentSender()); - - Intent result = receiver.getResult(); - int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS, - PackageInstaller.STATUS_FAILURE); - if (status != PackageInstaller.STATUS_SUCCESS) { - sendFailure(statusReceiver, "Rollback downgrade install failed: " - + result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)); - return; - } - - addRecentlyExecutedRollback(rollback); - sendSuccess(statusReceiver); - - // TODO: Restrict permissions for who can listen for this - // broadcast? - Intent broadcast = new Intent(Intent.ACTION_PACKAGE_ROLLBACK_EXECUTED, - Uri.fromParts("package", packageName, null)); - - // TODO: This call emits the warning "Calling a method in the - // system process without a qualified user". Fix that. - mContext.sendBroadcast(broadcast); - } catch (IOException e) { - Log.e(TAG, "Unable to roll back " + packageName, e); - sendFailure(statusReceiver, "IOException: " + e.toString()); - return; - } - } - - @Override - public void reloadPersistedData() { - synchronized (mLock) { - mAvailableRollbacks = null; - mRecentlyExecutedRollbacks = null; - } - getHandler().post(() -> ensureRollbackDataLoaded()); + public RollbackManagerService(Context context) { + super(context); } @Override - public void expireRollbackForPackage(String packageName) { - // TODO: Should this take a package version number in addition to - // package name? For now, just remove all rollbacks matching the - // package name. This method is only currently used to facilitate - // testing anyway. - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - Iterator<PackageRollbackData> iter = mAvailableRollbacks.iterator(); - while (iter.hasNext()) { - PackageRollbackData data = iter.next(); - if (data.info.packageName.equals(packageName)) { - iter.remove(); - removeFile(data.backupDir); - } - } - } - } - - /** - * Load rollback data from storage if it has not already been loaded. - * After calling this funciton, mAvailableRollbacks and - * mRecentlyExecutedRollbacks will be non-null. - */ - private void ensureRollbackDataLoaded() { - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - } - } - - /** - * Load rollback data from storage if it has not already been loaded. - * After calling this function, mAvailableRollbacks and - * mRecentlyExecutedRollbacks will be non-null. - */ - @GuardedBy("mLock") - private void ensureRollbackDataLoadedLocked() { - if (mAvailableRollbacks == null) { - loadRollbackDataLocked(); - } - } - - /** - * Load rollback data from storage. - * Note: We do potentially heavy IO here while holding mLock, because we - * have to have the rollback data loaded before we can do anything else - * meaningful. - */ - @GuardedBy("mLock") - private void loadRollbackDataLocked() { - mAvailableRollbacksDir.mkdirs(); - mAvailableRollbacks = new ArrayList<>(); - for (File rollbackDir : mAvailableRollbacksDir.listFiles()) { - if (rollbackDir.isDirectory()) { - // TODO: How to detect and clean up an invalid rollback - // directory? We don't know if it's invalid because something - // went wrong, or if it's only temporarily invalid because - // it's in the process of being created. - try { - File jsonFile = new File(rollbackDir, "rollback.json"); - String jsonString = IoUtils.readFileAsString(jsonFile.getAbsolutePath()); - JSONObject jsonObject = new JSONObject(jsonString); - String packageName = jsonObject.getString("packageName"); - long higherVersionCode = jsonObject.getLong("higherVersionCode"); - long lowerVersionCode = jsonObject.getLong("lowerVersionCode"); - Instant timestamp = Instant.parse(jsonObject.getString("timestamp")); - PackageRollbackData data = new PackageRollbackData( - new PackageRollbackInfo(packageName, - new PackageRollbackInfo.PackageVersion(higherVersionCode), - new PackageRollbackInfo.PackageVersion(lowerVersionCode)), - rollbackDir, timestamp); - mAvailableRollbacks.add(data); - } catch (IOException | JSONException | DateTimeParseException e) { - Log.e(TAG, "Unable to read rollback data at " + rollbackDir, e); - } - } - } - - mRecentlyExecutedRollbacks = new ArrayList<>(); - if (mRecentlyExecutedRollbacksFile.exists()) { - try { - // TODO: How to cope with changes to the format of this file from - // when RollbackStore is updated in the future? - String jsonString = IoUtils.readFileAsString( - mRecentlyExecutedRollbacksFile.getAbsolutePath()); - JSONObject object = new JSONObject(jsonString); - JSONArray array = object.getJSONArray("recentlyExecuted"); - for (int i = 0; i < array.length(); ++i) { - JSONObject element = array.getJSONObject(i); - String packageName = element.getString("packageName"); - long higherVersionCode = element.getLong("higherVersionCode"); - long lowerVersionCode = element.getLong("lowerVersionCode"); - PackageRollbackInfo target = new PackageRollbackInfo(packageName, - new PackageRollbackInfo.PackageVersion(higherVersionCode), - new PackageRollbackInfo.PackageVersion(lowerVersionCode)); - RollbackInfo rollback = new RollbackInfo(target); - mRecentlyExecutedRollbacks.add(rollback); - } - } catch (IOException | JSONException e) { - // TODO: What to do here? Surely we shouldn't just forget about - // everything after the point of exception? - Log.e(TAG, "Failed to read recently executed rollbacks", e); - } - } - - scheduleExpiration(0); - } - - /** - * Called when a package has been replaced with a different version. - * Removes all backups for the package not matching the currently - * installed package version. - */ - private void onPackageReplaced(String packageName) { - // TODO: Could this end up incorrectly deleting a rollback for a - // package that is about to be installed? - PackageRollbackInfo.PackageVersion installedVersion = - getInstalledPackageVersion(packageName); - - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - Iterator<PackageRollbackData> iter = mAvailableRollbacks.iterator(); - while (iter.hasNext()) { - PackageRollbackData data = iter.next(); - if (data.info.packageName.equals(packageName) - && !data.info.higherVersion.equals(installedVersion)) { - iter.remove(); - removeFile(data.backupDir); - } - } - } - } - - /** - * Called when a package has been completely removed from the device. - * Removes all backups and rollback history for the given package. - */ - private void onPackageFullyRemoved(String packageName) { - expireRollbackForPackage(packageName); - - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - Iterator<RollbackInfo> iter = mRecentlyExecutedRollbacks.iterator(); - boolean changed = false; - while (iter.hasNext()) { - RollbackInfo rollback = iter.next(); - if (packageName.equals(rollback.targetPackage.packageName)) { - iter.remove(); - changed = true; - } - } - - if (changed) { - saveRecentlyExecutedRollbacksLocked(); - } - } - } - - /** - * Write the list of recently executed rollbacks to storage. - * Note: This happens while mLock is held, which should be okay because we - * expect executed rollbacks to be modified only in exceptional cases. - */ - @GuardedBy("mLock") - private void saveRecentlyExecutedRollbacksLocked() { - try { - JSONObject json = new JSONObject(); - JSONArray array = new JSONArray(); - json.put("recentlyExecuted", array); - - for (int i = 0; i < mRecentlyExecutedRollbacks.size(); ++i) { - RollbackInfo rollback = mRecentlyExecutedRollbacks.get(i); - JSONObject element = new JSONObject(); - element.put("packageName", rollback.targetPackage.packageName); - element.put("higherVersionCode", rollback.targetPackage.higherVersion.versionCode); - element.put("lowerVersionCode", rollback.targetPackage.lowerVersion.versionCode); - array.put(element); - } - - PrintWriter pw = new PrintWriter(mRecentlyExecutedRollbacksFile); - pw.println(json.toString()); - pw.close(); - } catch (IOException | JSONException e) { - // TODO: What to do here? - Log.e(TAG, "Failed to save recently executed rollbacks", e); - } - } - - /** - * Records that the given package has been recently rolled back. - */ - private void addRecentlyExecutedRollback(RollbackInfo rollback) { - // TODO: if the list of rollbacks gets too big, trim it to only those - // that are necessary to keep track of. - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - mRecentlyExecutedRollbacks.add(rollback); - saveRecentlyExecutedRollbacksLocked(); - } - } - - /** - * Notifies an IntentSender of failure. - * - * @param statusReceiver where to send the failure - * @param message the failure message. - */ - private void sendFailure(IntentSender statusReceiver, String message) { - Log.e(TAG, message); - try { - // TODO: More context on which rollback failed? - // TODO: More refined failure code? - final Intent fillIn = new Intent(); - fillIn.putExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE); - fillIn.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE, message); - statusReceiver.sendIntent(mContext, 0, fillIn, null, null); - } catch (IntentSender.SendIntentException e) { - // Nowhere to send the result back to, so don't bother. - } - } - - /** - * Notifies an IntentSender of success. - */ - private void sendSuccess(IntentSender statusReceiver) { - try { - final Intent fillIn = new Intent(); - fillIn.putExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_SUCCESS); - statusReceiver.sendIntent(mContext, 0, fillIn, null, null); - } catch (IntentSender.SendIntentException e) { - // Nowhere to send the result back to, so don't bother. - } - } - - // Check to see if anything needs expiration, and if so, expire it. - // Schedules future expiration as appropriate. - // TODO: Handle cases where the user changes time on the device. - private void runExpiration() { - Instant now = Instant.now(); - Instant oldest = null; - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - - Iterator<PackageRollbackData> iter = mAvailableRollbacks.iterator(); - while (iter.hasNext()) { - PackageRollbackData data = iter.next(); - if (!now.isBefore(data.timestamp.plusMillis(ROLLBACK_LIFETIME_DURATION_MILLIS))) { - iter.remove(); - removeFile(data.backupDir); - } else if (oldest == null || oldest.isAfter(data.timestamp)) { - oldest = data.timestamp; - } - } - } - - if (oldest != null) { - scheduleExpiration(now.until(oldest.plusMillis(ROLLBACK_LIFETIME_DURATION_MILLIS), - ChronoUnit.MILLIS)); - } - } - - /** - * Schedules an expiration check to be run after the given duration in - * milliseconds has gone by. - */ - private void scheduleExpiration(long duration) { - getHandler().postDelayed(() -> runExpiration(), duration); - } - - /** - * Gets the RollbackManagerService's handler. - * To allow PackageManagerService to call into RollbackManagerService - * without fear of blocking the PackageManagerService thread. - */ - public Handler getHandler() { - return mHandlerThread.getThreadHandler(); - } - - /** - * Called via broadcast by the package manager when a package is being - * staged for install with rollback enabled. Called before the package has - * been installed. - * - * @param id the id of the enable rollback request - * @param installFlags information about what is being installed. - * @param newPackageCodePath path to the package about to be installed. - * @return true if enabling the rollback succeeds, false otherwise. - */ - private boolean enableRollback(int installFlags, File newPackageCodePath) { - if ((installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) { - Log.e(TAG, "Rollbacks not supported for instant app install"); - return false; - } - if ((installFlags & PackageManager.INSTALL_APEX) != 0) { - Log.e(TAG, "Rollbacks not supported for apex install"); - return false; - } - - // Get information about the package to be installed. - PackageParser.PackageLite newPackage = null; - try { - newPackage = PackageParser.parsePackageLite(newPackageCodePath, 0); - } catch (PackageParser.PackageParserException e) { - Log.e(TAG, "Unable to parse new package", e); - return false; - } - - String packageName = newPackage.packageName; - Log.i(TAG, "Enabling rollback for install of " + packageName); - - PackageRollbackInfo.PackageVersion newVersion = - new PackageRollbackInfo.PackageVersion(newPackage.versionCode); - - // Get information about the currently installed package. - PackageManagerInternal pm = LocalServices.getService(PackageManagerInternal.class); - PackageParser.Package installedPackage = pm.getPackage(packageName); - if (installedPackage == null) { - // TODO: Support rolling back fresh package installs rather than - // fail here. Test this case. - Log.e(TAG, packageName + " is not installed"); - return false; - } - PackageRollbackInfo.PackageVersion installedVersion = - new PackageRollbackInfo.PackageVersion(installedPackage.getLongVersionCode()); - - File backupDir; - try { - backupDir = Files.createTempDirectory( - mAvailableRollbacksDir.toPath(), packageName + "-").toFile(); - } catch (IOException e) { - Log.e(TAG, "Unable to create rollback for " + packageName, e); - return false; - } - - // TODO: Should the timestamp be for when we commit the install, not - // when we create the pending one? - Instant timestamp = Instant.now(); - try { - JSONObject json = new JSONObject(); - json.put("packageName", packageName); - json.put("higherVersionCode", newVersion.versionCode); - json.put("lowerVersionCode", installedVersion.versionCode); - json.put("timestamp", timestamp.toString()); - - File jsonFile = new File(backupDir, "rollback.json"); - PrintWriter pw = new PrintWriter(jsonFile); - pw.println(json.toString()); - pw.close(); - } catch (IOException | JSONException e) { - Log.e(TAG, "Unable to create rollback for " + packageName, e); - removeFile(backupDir); - return false; - } - - // TODO: Copy by hard link instead to save on cpu and storage space? - int status = PackageManagerServiceUtils.copyPackage(installedPackage.codePath, backupDir); - if (status != PackageManager.INSTALL_SUCCEEDED) { - Log.e(TAG, "Unable to copy package for rollback for " + packageName); - removeFile(backupDir); - return false; - } - - PackageRollbackData data = new PackageRollbackData( - new PackageRollbackInfo(packageName, newVersion, installedVersion), - backupDir, timestamp); - - synchronized (mLock) { - ensureRollbackDataLoadedLocked(); - mAvailableRollbacks.add(data); - } - - return true; - } - - // TODO: Don't copy this from PackageManagerShellCommand like this? - private static class LocalIntentReceiver { - private final LinkedBlockingQueue<Intent> mResult = new LinkedBlockingQueue<>(); - - private IIntentSender.Stub mLocalSender = new IIntentSender.Stub() { - @Override - public void send(int code, Intent intent, String resolvedType, IBinder whitelistToken, - IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) { - try { - mResult.offer(intent, 5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } - }; - - public IntentSender getIntentSender() { - return new IntentSender((IIntentSender) mLocalSender); - } - - public Intent getResult() { - try { - return mResult.take(); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } - } - - /** - * Deletes a file completely. - * If the file is a directory, its contents are deleted as well. - * Has no effect if the directory does not exist. - */ - private void removeFile(File file) { - if (file.isDirectory()) { - for (File child : file.listFiles()) { - removeFile(child); - } - } - if (file.exists()) { - file.delete(); - } - } - - /** - * Gets the version of the package currently installed. - * Returns null if the package is not currently installed. - */ - private PackageRollbackInfo.PackageVersion getInstalledPackageVersion(String packageName) { - PackageManager pm = mContext.getPackageManager(); - PackageInfo pkgInfo = null; - try { - pkgInfo = pm.getPackageInfo(packageName, 0); - } catch (PackageManager.NameNotFoundException e) { - return null; - } - - return new PackageRollbackInfo.PackageVersion(pkgInfo.getLongVersionCode()); - } - - /** - * Manages the lifecycle of RollbackManagerService within System Server. - */ - public static class Lifecycle extends SystemService { - private RollbackManagerService mService; - - public Lifecycle(Context context) { - super(context); - } - - @Override - public void onStart() { - mService = new RollbackManagerService(getContext()); - - // TODO: Set up sepolicy to allow publishing the service. - if (SELinux.isSELinuxEnforced()) { - Log.w(TAG, "RollbackManager disabled pending selinux policy updates"); - } else { - publishBinderService(Context.ROLLBACK_SERVICE, mService); - } - } + public void onStart() { + mService = new RollbackManagerServiceImpl(getContext()); + publishBinderService(Context.ROLLBACK_SERVICE, mService); } } diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java new file mode 100644 index 000000000000..0c2131203808 --- /dev/null +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -0,0 +1,832 @@ +/* + * 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.rollback; + +import android.Manifest; +import android.app.AppOpsManager; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.IIntentReceiver; +import android.content.IIntentSender; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.IntentSender; +import android.content.pm.PackageInfo; +import android.content.pm.PackageInstaller; +import android.content.pm.PackageManager; +import android.content.pm.PackageManagerInternal; +import android.content.pm.PackageParser; +import android.content.pm.ParceledListSlice; +import android.content.pm.StringParceledListSlice; +import android.content.rollback.IRollbackManager; +import android.content.rollback.PackageRollbackInfo; +import android.content.rollback.RollbackInfo; +import android.net.Uri; +import android.os.Binder; +import android.os.Bundle; +import android.os.Environment; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.IBinder; +import android.os.ParcelFileDescriptor; +import android.util.Log; + +import com.android.internal.annotations.GuardedBy; +import com.android.server.LocalServices; +import com.android.server.pm.PackageManagerServiceUtils; + +import libcore.io.IoUtils; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.nio.file.Files; +import java.time.Instant; +import java.time.format.DateTimeParseException; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; + +/** + * Implementation of service that manages APK level rollbacks. + */ +class RollbackManagerServiceImpl extends IRollbackManager.Stub { + + private static final String TAG = "RollbackManager"; + + // Rollbacks expire after 48 hours. + // TODO: How to test rollback expiration works properly? + private static final long ROLLBACK_LIFETIME_DURATION_MILLIS = 48 * 60 * 60 * 1000; + + // Lock used to synchronize accesses to in-memory rollback data + // structures. By convention, methods with the suffix "Locked" require + // mLock is held when they are called. + private final Object mLock = new Object(); + + // Package rollback data available to be used for rolling back a package. + // This list is null until the rollback data has been loaded. + @GuardedBy("mLock") + private List<PackageRollbackData> mAvailableRollbacks; + + // The list of recently executed rollbacks. + // This list is null until the rollback data has been loaded. + @GuardedBy("mLock") + private List<RollbackInfo> mRecentlyExecutedRollbacks; + + // Data for available rollbacks and recently executed rollbacks is + // persisted in storage. Assuming the rollback data directory is + // /data/rollback, we use the following directory structure + // to store this data: + // /data/rollback/ + // available/ + // com.package.A-XXX/ + // base.apk + // rollback.json + // com.package.B-YYY/ + // base.apk + // rollback.json + // recently_executed.json + // TODO: Use AtomicFile for rollback.json and recently_executed.json. + private final File mRollbackDataDir; + private final File mAvailableRollbacksDir; + private final File mRecentlyExecutedRollbacksFile; + + private final Context mContext; + private final HandlerThread mHandlerThread; + + RollbackManagerServiceImpl(Context context) { + mContext = context; + mHandlerThread = new HandlerThread("RollbackManagerServiceHandler"); + mHandlerThread.start(); + + mRollbackDataDir = new File(Environment.getDataDirectory(), "rollback"); + mAvailableRollbacksDir = new File(mRollbackDataDir, "available"); + mRecentlyExecutedRollbacksFile = new File(mRollbackDataDir, "recently_executed.json"); + + // Kick off loading of the rollback data from strorage in a background + // thread. + // TODO: Consider loading the rollback data directly here instead, to + // avoid the need to call ensureRollbackDataLoaded every time before + // accessing the rollback data? + // TODO: Test that this kicks off initial scheduling of rollback + // expiration. + getHandler().post(() -> ensureRollbackDataLoaded()); + + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_PACKAGE_REPLACED); + filter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED); + filter.addDataScheme("package"); + mContext.registerReceiver(new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + if (Intent.ACTION_PACKAGE_REPLACED.equals(action)) { + String packageName = intent.getData().getSchemeSpecificPart(); + onPackageReplaced(packageName); + } + if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) { + String packageName = intent.getData().getSchemeSpecificPart(); + onPackageFullyRemoved(packageName); + } + } + }, filter, null, getHandler()); + + IntentFilter enableRollbackFilter = new IntentFilter(); + enableRollbackFilter.addAction(Intent.ACTION_PACKAGE_ENABLE_ROLLBACK); + try { + enableRollbackFilter.addDataType("application/vnd.android.package-archive"); + } catch (IntentFilter.MalformedMimeTypeException e) { + Log.e(TAG, "addDataType", e); + } + + mContext.registerReceiver(new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (Intent.ACTION_PACKAGE_ENABLE_ROLLBACK.equals(intent.getAction())) { + int token = intent.getIntExtra( + PackageManagerInternal.EXTRA_ENABLE_ROLLBACK_TOKEN, -1); + int installFlags = intent.getIntExtra( + PackageManagerInternal.EXTRA_ENABLE_ROLLBACK_INSTALL_FLAGS, 0); + File newPackageCodePath = new File(intent.getData().getPath()); + + getHandler().post(() -> { + boolean success = enableRollback(installFlags, newPackageCodePath); + int ret = PackageManagerInternal.ENABLE_ROLLBACK_SUCCEEDED; + if (!success) { + ret = PackageManagerInternal.ENABLE_ROLLBACK_FAILED; + } + + PackageManagerInternal pm = LocalServices.getService( + PackageManagerInternal.class); + pm.setEnableRollbackCode(token, ret); + }); + + // We're handling the ordered broadcast. Abort the + // broadcast because there is no need for it to go to + // anyone else. + abortBroadcast(); + } + } + }, enableRollbackFilter, null, getHandler()); + } + + @Override + public RollbackInfo getAvailableRollback(String packageName) { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MANAGE_ROLLBACKS, + "getAvailableRollback"); + + PackageRollbackInfo.PackageVersion installedVersion = + getInstalledPackageVersion(packageName); + if (installedVersion == null) { + return null; + } + + synchronized (mLock) { + // TODO: Have ensureRollbackDataLoadedLocked return the list of + // available rollbacks, to hopefully avoid forgetting to call it? + ensureRollbackDataLoadedLocked(); + for (int i = 0; i < mAvailableRollbacks.size(); ++i) { + PackageRollbackData data = mAvailableRollbacks.get(i); + if (data.info.packageName.equals(packageName) + && data.info.higherVersion.equals(installedVersion)) { + // TODO: For atomic installs, check all dependent packages + // for available rollbacks and include that info here. + return new RollbackInfo(data.info); + } + } + } + + return null; + } + + @Override + public StringParceledListSlice getPackagesWithAvailableRollbacks() { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MANAGE_ROLLBACKS, + "getPackagesWithAvailableRollbacks"); + + // TODO: This may return packages whose rollback is out of date or + // expired. Presumably that's okay because the package rollback could + // be expired anyway between when the caller calls this method and + // when the caller calls getAvailableRollback for more details. + final Set<String> packageNames = new HashSet<>(); + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + for (int i = 0; i < mAvailableRollbacks.size(); ++i) { + PackageRollbackData data = mAvailableRollbacks.get(i); + packageNames.add(data.info.packageName); + } + } + return new StringParceledListSlice(new ArrayList<>(packageNames)); + } + + @Override + public ParceledListSlice<RollbackInfo> getRecentlyExecutedRollbacks() { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MANAGE_ROLLBACKS, + "getRecentlyExecutedRollbacks"); + + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + List<RollbackInfo> rollbacks = new ArrayList<>(mRecentlyExecutedRollbacks); + return new ParceledListSlice<>(rollbacks); + } + } + + @Override + public void executeRollback(RollbackInfo rollback, String callerPackageName, + IntentSender statusReceiver) { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MANAGE_ROLLBACKS, + "executeRollback"); + + final int callingUid = Binder.getCallingUid(); + AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class); + appOps.checkPackage(callingUid, callerPackageName); + + getHandler().post(() -> + executeRollbackInternal(rollback, callerPackageName, statusReceiver)); + } + + /** + * Performs the actual work to execute a rollback. + * The work is done on the current thread. This may be a long running + * operation. + */ + private void executeRollbackInternal(RollbackInfo rollback, + String callerPackageName, IntentSender statusReceiver) { + String packageName = rollback.targetPackage.packageName; + Log.i(TAG, "Initiating rollback of " + packageName); + + PackageRollbackInfo.PackageVersion installedVersion = + getInstalledPackageVersion(packageName); + if (installedVersion == null) { + // TODO: Test this case + sendFailure(statusReceiver, "Target package to roll back is not installed"); + return; + } + + if (!rollback.targetPackage.higherVersion.equals(installedVersion)) { + // TODO: Test this case + sendFailure(statusReceiver, "Target package version to roll back not installed."); + return; + } + + // TODO: We assume that between now and the time we commit the + // downgrade install, the currently installed package version does not + // change. This is not safe to assume, particularly in the case of a + // rollback racing with a roll-forward fix of a buggy package. + // Figure out how to ensure we don't commit the rollback if + // roll forward happens at the same time. + PackageRollbackData data = null; + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + for (int i = 0; i < mAvailableRollbacks.size(); ++i) { + PackageRollbackData available = mAvailableRollbacks.get(i); + // TODO: Check if available.info.lowerVersion matches + // rollback.targetPackage.lowerVersion? + if (available.info.packageName.equals(packageName) + && available.info.higherVersion.equals(installedVersion)) { + data = available; + break; + } + } + } + + if (data == null) { + sendFailure(statusReceiver, "Rollback not available"); + return; + } + + // Get a context for the caller to use to install the downgraded + // version of the package. + Context context = null; + try { + context = mContext.createPackageContext(callerPackageName, 0); + } catch (PackageManager.NameNotFoundException e) { + sendFailure(statusReceiver, "Invalid callerPackageName"); + return; + } + + PackageManager pm = context.getPackageManager(); + try { + PackageInstaller.Session session = null; + + PackageInstaller packageInstaller = pm.getPackageInstaller(); + PackageInstaller.SessionParams params = new PackageInstaller.SessionParams( + PackageInstaller.SessionParams.MODE_FULL_INSTALL); + params.setAllowDowngrade(true); + int sessionId = packageInstaller.createSession(params); + session = packageInstaller.openSession(sessionId); + + // TODO: Will it always be called "base.apk"? What about splits? + File baseApk = new File(data.backupDir, "base.apk"); + try (ParcelFileDescriptor fd = ParcelFileDescriptor.open(baseApk, + ParcelFileDescriptor.MODE_READ_ONLY)) { + final long token = Binder.clearCallingIdentity(); + try { + session.write("base.apk", 0, baseApk.length(), fd); + } finally { + Binder.restoreCallingIdentity(token); + } + } + + final LocalIntentReceiver receiver = new LocalIntentReceiver(); + session.commit(receiver.getIntentSender()); + + Intent result = receiver.getResult(); + int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS, + PackageInstaller.STATUS_FAILURE); + if (status != PackageInstaller.STATUS_SUCCESS) { + sendFailure(statusReceiver, "Rollback downgrade install failed: " + + result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)); + return; + } + + addRecentlyExecutedRollback(rollback); + sendSuccess(statusReceiver); + + Intent broadcast = new Intent(Intent.ACTION_PACKAGE_ROLLBACK_EXECUTED, + Uri.fromParts("package", packageName, Manifest.permission.MANAGE_ROLLBACKS)); + + // TODO: This call emits the warning "Calling a method in the + // system process without a qualified user". Fix that. + mContext.sendBroadcast(broadcast); + } catch (IOException e) { + Log.e(TAG, "Unable to roll back " + packageName, e); + sendFailure(statusReceiver, "IOException: " + e.toString()); + return; + } + } + + @Override + public void reloadPersistedData() { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MANAGE_ROLLBACKS, + "reloadPersistedData"); + + synchronized (mLock) { + mAvailableRollbacks = null; + mRecentlyExecutedRollbacks = null; + } + getHandler().post(() -> ensureRollbackDataLoaded()); + } + + @Override + public void expireRollbackForPackage(String packageName) { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MANAGE_ROLLBACKS, + "expireRollbackForPackage"); + + // TODO: Should this take a package version number in addition to + // package name? For now, just remove all rollbacks matching the + // package name. This method is only currently used to facilitate + // testing anyway. + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + Iterator<PackageRollbackData> iter = mAvailableRollbacks.iterator(); + while (iter.hasNext()) { + PackageRollbackData data = iter.next(); + if (data.info.packageName.equals(packageName)) { + iter.remove(); + removeFile(data.backupDir); + } + } + } + } + + /** + * Load rollback data from storage if it has not already been loaded. + * After calling this funciton, mAvailableRollbacks and + * mRecentlyExecutedRollbacks will be non-null. + */ + private void ensureRollbackDataLoaded() { + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + } + } + + /** + * Load rollback data from storage if it has not already been loaded. + * After calling this function, mAvailableRollbacks and + * mRecentlyExecutedRollbacks will be non-null. + */ + @GuardedBy("mLock") + private void ensureRollbackDataLoadedLocked() { + if (mAvailableRollbacks == null) { + loadRollbackDataLocked(); + } + } + + /** + * Load rollback data from storage. + * Note: We do potentially heavy IO here while holding mLock, because we + * have to have the rollback data loaded before we can do anything else + * meaningful. + */ + @GuardedBy("mLock") + private void loadRollbackDataLocked() { + mAvailableRollbacksDir.mkdirs(); + mAvailableRollbacks = new ArrayList<>(); + for (File rollbackDir : mAvailableRollbacksDir.listFiles()) { + if (rollbackDir.isDirectory()) { + // TODO: How to detect and clean up an invalid rollback + // directory? We don't know if it's invalid because something + // went wrong, or if it's only temporarily invalid because + // it's in the process of being created. + try { + File jsonFile = new File(rollbackDir, "rollback.json"); + String jsonString = IoUtils.readFileAsString(jsonFile.getAbsolutePath()); + JSONObject jsonObject = new JSONObject(jsonString); + String packageName = jsonObject.getString("packageName"); + long higherVersionCode = jsonObject.getLong("higherVersionCode"); + long lowerVersionCode = jsonObject.getLong("lowerVersionCode"); + Instant timestamp = Instant.parse(jsonObject.getString("timestamp")); + PackageRollbackData data = new PackageRollbackData( + new PackageRollbackInfo(packageName, + new PackageRollbackInfo.PackageVersion(higherVersionCode), + new PackageRollbackInfo.PackageVersion(lowerVersionCode)), + rollbackDir, timestamp); + mAvailableRollbacks.add(data); + } catch (IOException | JSONException | DateTimeParseException e) { + Log.e(TAG, "Unable to read rollback data at " + rollbackDir, e); + } + } + } + + mRecentlyExecutedRollbacks = new ArrayList<>(); + if (mRecentlyExecutedRollbacksFile.exists()) { + try { + // TODO: How to cope with changes to the format of this file from + // when RollbackStore is updated in the future? + String jsonString = IoUtils.readFileAsString( + mRecentlyExecutedRollbacksFile.getAbsolutePath()); + JSONObject object = new JSONObject(jsonString); + JSONArray array = object.getJSONArray("recentlyExecuted"); + for (int i = 0; i < array.length(); ++i) { + JSONObject element = array.getJSONObject(i); + String packageName = element.getString("packageName"); + long higherVersionCode = element.getLong("higherVersionCode"); + long lowerVersionCode = element.getLong("lowerVersionCode"); + PackageRollbackInfo target = new PackageRollbackInfo(packageName, + new PackageRollbackInfo.PackageVersion(higherVersionCode), + new PackageRollbackInfo.PackageVersion(lowerVersionCode)); + RollbackInfo rollback = new RollbackInfo(target); + mRecentlyExecutedRollbacks.add(rollback); + } + } catch (IOException | JSONException e) { + // TODO: What to do here? Surely we shouldn't just forget about + // everything after the point of exception? + Log.e(TAG, "Failed to read recently executed rollbacks", e); + } + } + + scheduleExpiration(0); + } + + /** + * Called when a package has been replaced with a different version. + * Removes all backups for the package not matching the currently + * installed package version. + */ + private void onPackageReplaced(String packageName) { + // TODO: Could this end up incorrectly deleting a rollback for a + // package that is about to be installed? + PackageRollbackInfo.PackageVersion installedVersion = + getInstalledPackageVersion(packageName); + + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + Iterator<PackageRollbackData> iter = mAvailableRollbacks.iterator(); + while (iter.hasNext()) { + PackageRollbackData data = iter.next(); + if (data.info.packageName.equals(packageName) + && !data.info.higherVersion.equals(installedVersion)) { + iter.remove(); + removeFile(data.backupDir); + } + } + } + } + + /** + * Called when a package has been completely removed from the device. + * Removes all backups and rollback history for the given package. + */ + private void onPackageFullyRemoved(String packageName) { + expireRollbackForPackage(packageName); + + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + Iterator<RollbackInfo> iter = mRecentlyExecutedRollbacks.iterator(); + boolean changed = false; + while (iter.hasNext()) { + RollbackInfo rollback = iter.next(); + if (packageName.equals(rollback.targetPackage.packageName)) { + iter.remove(); + changed = true; + } + } + + if (changed) { + saveRecentlyExecutedRollbacksLocked(); + } + } + } + + /** + * Write the list of recently executed rollbacks to storage. + * Note: This happens while mLock is held, which should be okay because we + * expect executed rollbacks to be modified only in exceptional cases. + */ + @GuardedBy("mLock") + private void saveRecentlyExecutedRollbacksLocked() { + try { + JSONObject json = new JSONObject(); + JSONArray array = new JSONArray(); + json.put("recentlyExecuted", array); + + for (int i = 0; i < mRecentlyExecutedRollbacks.size(); ++i) { + RollbackInfo rollback = mRecentlyExecutedRollbacks.get(i); + JSONObject element = new JSONObject(); + element.put("packageName", rollback.targetPackage.packageName); + element.put("higherVersionCode", rollback.targetPackage.higherVersion.versionCode); + element.put("lowerVersionCode", rollback.targetPackage.lowerVersion.versionCode); + array.put(element); + } + + PrintWriter pw = new PrintWriter(mRecentlyExecutedRollbacksFile); + pw.println(json.toString()); + pw.close(); + } catch (IOException | JSONException e) { + // TODO: What to do here? + Log.e(TAG, "Failed to save recently executed rollbacks", e); + } + } + + /** + * Records that the given package has been recently rolled back. + */ + private void addRecentlyExecutedRollback(RollbackInfo rollback) { + // TODO: if the list of rollbacks gets too big, trim it to only those + // that are necessary to keep track of. + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + mRecentlyExecutedRollbacks.add(rollback); + saveRecentlyExecutedRollbacksLocked(); + } + } + + /** + * Notifies an IntentSender of failure. + * + * @param statusReceiver where to send the failure + * @param message the failure message. + */ + private void sendFailure(IntentSender statusReceiver, String message) { + Log.e(TAG, message); + try { + // TODO: More context on which rollback failed? + // TODO: More refined failure code? + final Intent fillIn = new Intent(); + fillIn.putExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE); + fillIn.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE, message); + statusReceiver.sendIntent(mContext, 0, fillIn, null, null); + } catch (IntentSender.SendIntentException e) { + // Nowhere to send the result back to, so don't bother. + } + } + + /** + * Notifies an IntentSender of success. + */ + private void sendSuccess(IntentSender statusReceiver) { + try { + final Intent fillIn = new Intent(); + fillIn.putExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_SUCCESS); + statusReceiver.sendIntent(mContext, 0, fillIn, null, null); + } catch (IntentSender.SendIntentException e) { + // Nowhere to send the result back to, so don't bother. + } + } + + // Check to see if anything needs expiration, and if so, expire it. + // Schedules future expiration as appropriate. + // TODO: Handle cases where the user changes time on the device. + private void runExpiration() { + Instant now = Instant.now(); + Instant oldest = null; + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + + Iterator<PackageRollbackData> iter = mAvailableRollbacks.iterator(); + while (iter.hasNext()) { + PackageRollbackData data = iter.next(); + if (!now.isBefore(data.timestamp.plusMillis(ROLLBACK_LIFETIME_DURATION_MILLIS))) { + iter.remove(); + removeFile(data.backupDir); + } else if (oldest == null || oldest.isAfter(data.timestamp)) { + oldest = data.timestamp; + } + } + } + + if (oldest != null) { + scheduleExpiration(now.until(oldest.plusMillis(ROLLBACK_LIFETIME_DURATION_MILLIS), + ChronoUnit.MILLIS)); + } + } + + /** + * Schedules an expiration check to be run after the given duration in + * milliseconds has gone by. + */ + private void scheduleExpiration(long duration) { + getHandler().postDelayed(() -> runExpiration(), duration); + } + + private Handler getHandler() { + return mHandlerThread.getThreadHandler(); + } + + /** + * Called via broadcast by the package manager when a package is being + * staged for install with rollback enabled. Called before the package has + * been installed. + * + * @param id the id of the enable rollback request + * @param installFlags information about what is being installed. + * @param newPackageCodePath path to the package about to be installed. + * @return true if enabling the rollback succeeds, false otherwise. + */ + private boolean enableRollback(int installFlags, File newPackageCodePath) { + if ((installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) { + Log.e(TAG, "Rollbacks not supported for instant app install"); + return false; + } + if ((installFlags & PackageManager.INSTALL_APEX) != 0) { + Log.e(TAG, "Rollbacks not supported for apex install"); + return false; + } + + // Get information about the package to be installed. + PackageParser.PackageLite newPackage = null; + try { + newPackage = PackageParser.parsePackageLite(newPackageCodePath, 0); + } catch (PackageParser.PackageParserException e) { + Log.e(TAG, "Unable to parse new package", e); + return false; + } + + String packageName = newPackage.packageName; + Log.i(TAG, "Enabling rollback for install of " + packageName); + + PackageRollbackInfo.PackageVersion newVersion = + new PackageRollbackInfo.PackageVersion(newPackage.versionCode); + + // Get information about the currently installed package. + PackageManagerInternal pm = LocalServices.getService(PackageManagerInternal.class); + PackageParser.Package installedPackage = pm.getPackage(packageName); + if (installedPackage == null) { + // TODO: Support rolling back fresh package installs rather than + // fail here. Test this case. + Log.e(TAG, packageName + " is not installed"); + return false; + } + PackageRollbackInfo.PackageVersion installedVersion = + new PackageRollbackInfo.PackageVersion(installedPackage.getLongVersionCode()); + + File backupDir; + try { + backupDir = Files.createTempDirectory( + mAvailableRollbacksDir.toPath(), packageName + "-").toFile(); + } catch (IOException e) { + Log.e(TAG, "Unable to create rollback for " + packageName, e); + return false; + } + + // TODO: Should the timestamp be for when we commit the install, not + // when we create the pending one? + Instant timestamp = Instant.now(); + try { + JSONObject json = new JSONObject(); + json.put("packageName", packageName); + json.put("higherVersionCode", newVersion.versionCode); + json.put("lowerVersionCode", installedVersion.versionCode); + json.put("timestamp", timestamp.toString()); + + File jsonFile = new File(backupDir, "rollback.json"); + PrintWriter pw = new PrintWriter(jsonFile); + pw.println(json.toString()); + pw.close(); + } catch (IOException | JSONException e) { + Log.e(TAG, "Unable to create rollback for " + packageName, e); + removeFile(backupDir); + return false; + } + + // TODO: Copy by hard link instead to save on cpu and storage space? + int status = PackageManagerServiceUtils.copyPackage(installedPackage.codePath, backupDir); + if (status != PackageManager.INSTALL_SUCCEEDED) { + Log.e(TAG, "Unable to copy package for rollback for " + packageName); + removeFile(backupDir); + return false; + } + + PackageRollbackData data = new PackageRollbackData( + new PackageRollbackInfo(packageName, newVersion, installedVersion), + backupDir, timestamp); + + synchronized (mLock) { + ensureRollbackDataLoadedLocked(); + mAvailableRollbacks.add(data); + } + + return true; + } + + // TODO: Don't copy this from PackageManagerShellCommand like this? + private static class LocalIntentReceiver { + private final LinkedBlockingQueue<Intent> mResult = new LinkedBlockingQueue<>(); + + private IIntentSender.Stub mLocalSender = new IIntentSender.Stub() { + @Override + public void send(int code, Intent intent, String resolvedType, IBinder whitelistToken, + IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) { + try { + mResult.offer(intent, 5, TimeUnit.SECONDS); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + }; + + public IntentSender getIntentSender() { + return new IntentSender((IIntentSender) mLocalSender); + } + + public Intent getResult() { + try { + return mResult.take(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + } + + /** + * Deletes a file completely. + * If the file is a directory, its contents are deleted as well. + * Has no effect if the directory does not exist. + */ + private void removeFile(File file) { + if (file.isDirectory()) { + for (File child : file.listFiles()) { + removeFile(child); + } + } + if (file.exists()) { + file.delete(); + } + } + + /** + * Gets the version of the package currently installed. + * Returns null if the package is not currently installed. + */ + private PackageRollbackInfo.PackageVersion getInstalledPackageVersion(String packageName) { + PackageManager pm = mContext.getPackageManager(); + PackageInfo pkgInfo = null; + try { + pkgInfo = pm.getPackageInfo(packageName, 0); + } catch (PackageManager.NameNotFoundException e) { + return null; + } + + return new PackageRollbackInfo.PackageVersion(pkgInfo.getLongVersionCode()); + } +} diff --git a/services/core/java/com/android/server/rollback/TEST_MAPPING b/services/core/java/com/android/server/rollback/TEST_MAPPING new file mode 100644 index 000000000000..c1d95ac85c23 --- /dev/null +++ b/services/core/java/com/android/server/rollback/TEST_MAPPING @@ -0,0 +1,7 @@ +{ + "presubmit": [ + { + "name": "RollbackTest" + } + ] +} diff --git a/services/core/java/com/android/server/security/VerityUtils.java b/services/core/java/com/android/server/security/VerityUtils.java index 667d21dc59a0..839ed302ba73 100644 --- a/services/core/java/com/android/server/security/VerityUtils.java +++ b/services/core/java/com/android/server/security/VerityUtils.java @@ -30,6 +30,7 @@ import android.util.apk.VerityBuilder; import libcore.util.HexEncoding; +import java.io.File; import java.io.FileDescriptor; import java.io.IOException; import java.io.RandomAccessFile; @@ -49,11 +50,27 @@ import sun.security.pkcs.PKCS7; abstract public class VerityUtils { private static final String TAG = "VerityUtils"; + /** + * File extension of the signature file. For example, foo.apk.fsv_sig is the signature file of + * foo.apk. + */ + public static final String FSVERITY_SIGNATURE_FILE_EXTENSION = ".fsv_sig"; + /** The maximum size of signature file. This is just to avoid potential abuse. */ private static final int MAX_SIGNATURE_FILE_SIZE_BYTES = 8192; private static final boolean DEBUG = false; + /** Returns true if the given file looks like containing an fs-verity signature. */ + public static boolean isFsveritySignatureFile(File file) { + return file.getName().endsWith(FSVERITY_SIGNATURE_FILE_EXTENSION); + } + + /** Returns the fs-verity signature file path of the given file. */ + public static String getFsveritySignatureFilePath(String filePath) { + return filePath + FSVERITY_SIGNATURE_FILE_EXTENSION; + } + /** Returns whether the file has fs-verity enabled. */ public static boolean hasFsverity(@NonNull String filePath) { // NB: only measure but not check the actual measurement here. As long as this succeeds, diff --git a/services/core/java/com/android/server/signedconfig/SignedConfigApplicator.java b/services/core/java/com/android/server/signedconfig/GlobalSettingsConfigApplicator.java index 4908964109ad..438c303de6cc 100644 --- a/services/core/java/com/android/server/signedconfig/SignedConfigApplicator.java +++ b/services/core/java/com/android/server/signedconfig/GlobalSettingsConfigApplicator.java @@ -30,7 +30,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -class SignedConfigApplicator { +class GlobalSettingsConfigApplicator { private static final String TAG = "SignedConfig"; @@ -68,7 +68,7 @@ class SignedConfigApplicator { private final String mSourcePackage; private final SignatureVerifier mVerifier; - SignedConfigApplicator(Context context, String sourcePackage) { + GlobalSettingsConfigApplicator(Context context, String sourcePackage) { mContext = context; mSourcePackage = sourcePackage; mVerifier = new SignatureVerifier(); @@ -102,7 +102,7 @@ class SignedConfigApplicator { void applyConfig(String configStr, String signature) { if (!checkSignature(configStr, signature)) { - Slog.e(TAG, "Signature check on signed configuration in package " + mSourcePackage + Slog.e(TAG, "Signature check on global settings in package " + mSourcePackage + " failed; ignoring"); return; } @@ -110,26 +110,26 @@ class SignedConfigApplicator { try { config = SignedConfig.parse(configStr, ALLOWED_KEYS, KEY_VALUE_MAPPERS); } catch (InvalidConfigException e) { - Slog.e(TAG, "Failed to parse config from package " + mSourcePackage, e); + Slog.e(TAG, "Failed to parse global settings from package " + mSourcePackage, e); return; } int currentVersion = getCurrentConfigVersion(); if (currentVersion >= config.version) { - Slog.i(TAG, "Config from package " + mSourcePackage + " is older than existing: " - + config.version + "<=" + currentVersion); + Slog.i(TAG, "Global settings from package " + mSourcePackage + + " is older than existing: " + config.version + "<=" + currentVersion); return; } // We have new config! - Slog.i(TAG, "Got new signed config from package " + mSourcePackage + ": version " + Slog.i(TAG, "Got new global settings from package " + mSourcePackage + ": version " + config.version + " replacing existing version " + currentVersion); SignedConfig.PerSdkConfig matchedConfig = config.getMatchingConfig(Build.VERSION.SDK_INT); if (matchedConfig == null) { - Slog.i(TAG, "Config is not applicable to current SDK version; ignoring"); + Slog.i(TAG, "Settings is not applicable to current SDK version; ignoring"); return; } - Slog.i(TAG, "Updating signed config to version " + config.version); + Slog.i(TAG, "Updating global settings to version " + config.version); updateCurrentConfig(config.version, matchedConfig.values); } } diff --git a/services/core/java/com/android/server/signedconfig/SignedConfigService.java b/services/core/java/com/android/server/signedconfig/SignedConfigService.java index 84ce93f04c74..6bcee1413fa8 100644 --- a/services/core/java/com/android/server/signedconfig/SignedConfigService.java +++ b/services/core/java/com/android/server/signedconfig/SignedConfigService.java @@ -42,8 +42,8 @@ public class SignedConfigService { private static final String TAG = "SignedConfig"; // TODO should these be elsewhere? In a public API? - private static final String KEY_CONFIG = "android.signedconfig"; - private static final String KEY_CONFIG_SIGNATURE = "android.signedconfig.signature"; + private static final String KEY_GLOBAL_SETTINGS = "android.settings.global"; + private static final String KEY_GLOBAL_SETTINGS_SIGNATURE = "android.settings.global.signature"; private static class UpdateReceiver extends BroadcastReceiver { @Override @@ -80,25 +80,25 @@ public class SignedConfigService { if (DBG) Slog.d(TAG, "handlePackageBroadcast: no metadata"); return; } - if (metaData.containsKey(KEY_CONFIG) - && metaData.containsKey(KEY_CONFIG_SIGNATURE)) { - String config = metaData.getString(KEY_CONFIG); - String signature = metaData.getString(KEY_CONFIG_SIGNATURE); + if (metaData.containsKey(KEY_GLOBAL_SETTINGS) + && metaData.containsKey(KEY_GLOBAL_SETTINGS_SIGNATURE)) { + String config = metaData.getString(KEY_GLOBAL_SETTINGS); + String signature = metaData.getString(KEY_GLOBAL_SETTINGS_SIGNATURE); try { // Base64 encoding is standard (not URL safe) encoding: RFC4648 config = new String(Base64.getDecoder().decode(config), StandardCharsets.UTF_8); } catch (IllegalArgumentException iae) { - Slog.e(TAG, "Failed to base64 decode config from " + packageName); + Slog.e(TAG, "Failed to base64 decode global settings config from " + packageName); return; } if (DBG) { - Slog.d(TAG, "Got signed config: " + config); - Slog.d(TAG, "Got config signature: " + signature); + Slog.d(TAG, "Got global settings config: " + config); + Slog.d(TAG, "Got global settings signature: " + signature); } - new SignedConfigApplicator(mContext, packageName).applyConfig( + new GlobalSettingsConfigApplicator(mContext, packageName).applyConfig( config, signature); } else { - if (DBG) Slog.d(TAG, "Package has no config/signature."); + if (DBG) Slog.d(TAG, "Package has no global settings config/signature."); } } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 2cd0168aff42..8884615d2fe1 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -271,7 +271,10 @@ final class ActivityRecord extends ConfigurationContainer { boolean fullscreen; // The activity is opaque and fills the entire space of this task. // TODO: See if it possible to combine this with the fullscreen field. final boolean hasWallpaper; // Has a wallpaper window as a background. - final boolean noDisplay; // activity is not displayed? + @VisibleForTesting + boolean noDisplay; // activity is not displayed? + @VisibleForTesting + int mHandoverLaunchDisplayId = INVALID_DISPLAY; // Handover launch display id to next activity. private final boolean componentSpecified; // did caller specify an explicit component? final boolean rootVoiceInteraction; // was this the root activity of a voice interaction? @@ -1019,6 +1022,8 @@ final class ActivityRecord extends ConfigurationContainer { if (useLockTask && lockTaskLaunchMode == LOCK_TASK_LAUNCH_MODE_DEFAULT) { lockTaskLaunchMode = LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED; } + // Gets launch display id from options. It returns INVALID_DISPLAY if not set. + mHandoverLaunchDisplayId = options.getLaunchDisplayId(); } } diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java index f58b83d682f6..a50ae8431cb0 100644 --- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java @@ -947,6 +947,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { final WindowProcessController wpc = mService.getProcessController(r.processName, r.info.applicationInfo.uid); + boolean knownToBeDead = false; if (wpc != null && wpc.hasThread()) { try { if ((r.info.flags & ActivityInfo.FLAG_MULTIPROCESS) == 0 @@ -965,6 +966,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // If a dead object exception was thrown -- fall through to // restart the application. + knownToBeDead = true; } // Suppress transition until the new activity becomes ready, otherwise the keyguard can @@ -978,7 +980,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // ATMS lock held. final Message msg = PooledLambda.obtainMessage( ActivityManagerInternal::startProcess, mService.mAmInternal, r.processName, - r.info.applicationInfo, true, "activity", r.intent.getComponent()); + r.info.applicationInfo, knownToBeDead, "activity", r.intent.getComponent()); mService.mH.sendMessage(msg); } @@ -2657,7 +2659,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { return mService.getActivityStartController().startActivityInPackage( task.mCallingUid, callingPid, callingUid, callingPackage, intent, null, null, null, 0, 0, options, userId, task, "startActivityFromRecents", - false /* validateIncomingUser */, null /* originatingPendingIntent */); + false /* validateIncomingUser */, null /* originatingPendingIntent */, + false /* allowBackgroundActivityStart */); } finally { if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY && task != null) { // If we are launching the task in the docked stack, put it into resizing mode so diff --git a/services/core/java/com/android/server/wm/ActivityStartController.java b/services/core/java/com/android/server/wm/ActivityStartController.java index b4d5d9f6e5cd..08596836ed4d 100644 --- a/services/core/java/com/android/server/wm/ActivityStartController.java +++ b/services/core/java/com/android/server/wm/ActivityStartController.java @@ -258,7 +258,7 @@ public class ActivityStartController { String callingPackage, Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode, int startFlags, SafeActivityOptions options, int userId, TaskRecord inTask, String reason, boolean validateIncomingUser, - PendingIntentRecord originatingPendingIntent) { + PendingIntentRecord originatingPendingIntent, boolean allowBackgroundActivityStart) { userId = checkTargetUser(userId, validateIncomingUser, realCallingPid, realCallingUid, reason); @@ -278,6 +278,7 @@ public class ActivityStartController { .setMayWait(userId) .setInTask(inTask) .setOriginatingPendingIntent(originatingPendingIntent) + .setAllowBackgroundActivityStart(allowBackgroundActivityStart) .execute(); } @@ -294,7 +295,8 @@ public class ActivityStartController { */ final int startActivitiesInPackage(int uid, String callingPackage, Intent[] intents, String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options, int userId, - boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent) { + boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent, + boolean allowBackgroundActivityStart) { final String reason = "startActivityInPackage"; @@ -303,12 +305,13 @@ public class ActivityStartController { // TODO: Switch to user app stacks here. return startActivities(null, uid, callingPackage, intents, resolvedTypes, resultTo, options, - userId, reason, originatingPendingIntent); + userId, reason, originatingPendingIntent, allowBackgroundActivityStart); } int startActivities(IApplicationThread caller, int callingUid, String callingPackage, Intent[] intents, String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options, - int userId, String reason, PendingIntentRecord originatingPendingIntent) { + int userId, String reason, PendingIntentRecord originatingPendingIntent, + boolean allowBackgroundActivityStart) { if (intents == null) { throw new NullPointerException("intents is null"); } @@ -387,6 +390,7 @@ public class ActivityStartController { // top one as otherwise an activity below might consume it. .setAllowPendingRemoteAnimationRegistryLookup(top /* allowLookup*/) .setOriginatingPendingIntent(originatingPendingIntent) + .setAllowBackgroundActivityStart(allowBackgroundActivityStart) .execute(); if (res < 0) { diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 36701ea599dc..b100ecdb0e73 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -323,6 +323,7 @@ class ActivityStarter { WaitResult waitResult; int filterCallingUid; PendingIntentRecord originatingPendingIntent; + boolean allowBackgroundActivityStart; /** * If set to {@code true}, allows this activity start to look into @@ -380,6 +381,7 @@ class ActivityStarter { allowPendingRemoteAnimationRegistryLookup = true; filterCallingUid = UserHandle.USER_NULL; originatingPendingIntent = null; + allowBackgroundActivityStart = false; } /** @@ -419,6 +421,7 @@ class ActivityStarter { = request.allowPendingRemoteAnimationRegistryLookup; filterCallingUid = request.filterCallingUid; originatingPendingIntent = request.originatingPendingIntent; + allowBackgroundActivityStart = request.allowBackgroundActivityStart; } } @@ -504,7 +507,7 @@ class ActivityStarter { mRequest.activityOptions, mRequest.ignoreTargetSecurity, mRequest.userId, mRequest.inTask, mRequest.reason, mRequest.allowPendingRemoteAnimationRegistryLookup, - mRequest.originatingPendingIntent); + mRequest.originatingPendingIntent, mRequest.allowBackgroundActivityStart); } else { return startActivity(mRequest.caller, mRequest.intent, mRequest.ephemeralIntent, mRequest.resolvedType, mRequest.activityInfo, mRequest.resolveInfo, @@ -515,7 +518,7 @@ class ActivityStarter { mRequest.ignoreTargetSecurity, mRequest.componentSpecified, mRequest.outActivity, mRequest.inTask, mRequest.reason, mRequest.allowPendingRemoteAnimationRegistryLookup, - mRequest.originatingPendingIntent); + mRequest.originatingPendingIntent, mRequest.allowBackgroundActivityStart); } } finally { onExecutionComplete(); @@ -548,7 +551,7 @@ class ActivityStarter { SafeActivityOptions options, boolean ignoreTargetSecurity, boolean componentSpecified, ActivityRecord[] outActivity, TaskRecord inTask, String reason, boolean allowPendingRemoteAnimationRegistryLookup, - PendingIntentRecord originatingPendingIntent) { + PendingIntentRecord originatingPendingIntent, boolean allowBackgroundActivityStart) { if (TextUtils.isEmpty(reason)) { throw new IllegalArgumentException("Need to specify a reason."); @@ -561,7 +564,8 @@ class ActivityStarter { aInfo, rInfo, voiceSession, voiceInteractor, resultTo, resultWho, requestCode, callingPid, callingUid, callingPackage, realCallingPid, realCallingUid, startFlags, options, ignoreTargetSecurity, componentSpecified, mLastStartActivityRecord, - inTask, allowPendingRemoteAnimationRegistryLookup, originatingPendingIntent); + inTask, allowPendingRemoteAnimationRegistryLookup, originatingPendingIntent, + allowBackgroundActivityStart); if (outActivity != null) { // mLastStartActivityRecord[0] is set in the call to startActivity above. @@ -592,7 +596,7 @@ class ActivityStarter { SafeActivityOptions options, boolean ignoreTargetSecurity, boolean componentSpecified, ActivityRecord[] outActivity, TaskRecord inTask, boolean allowPendingRemoteAnimationRegistryLookup, - PendingIntentRecord originatingPendingIntent) { + PendingIntentRecord originatingPendingIntent, boolean allowBackgroundActivityStart) { int err = ActivityManager.START_SUCCESS; // Pull the optional Ephemeral Installer-only bundle out of the options early. final Bundle verificationBundle @@ -742,7 +746,7 @@ class ActivityStarter { // on START_ABORTED if (!abort) { abort |= shouldAbortBackgroundActivityStart(callingUid, callingPackage, realCallingUid, - callerApp); + callerApp, originatingPendingIntent, allowBackgroundActivityStart); } // Merge the two options bundles, while realCallerOptions takes precedence. @@ -890,7 +894,8 @@ class ActivityStarter { } private boolean shouldAbortBackgroundActivityStart(int callingUid, final String callingPackage, - int realCallingUid, WindowProcessController callerApp) { + int realCallingUid, WindowProcessController callerApp, + PendingIntentRecord originatingPendingIntent, boolean allowBackgroundActivityStart) { if (mService.isBackgroundActivityStartsEnabled()) { return false; } @@ -902,12 +907,25 @@ class ActivityStarter { if (callerApp != null && callerApp.hasForegroundActivities()) { return false; } - // don't abort if the callingUid is in the foreground - if (isUidForeground(callingUid)) { + // don't abort if the callingUid is in the foreground or is a persistent system process + if (isUidForeground(callingUid) || isUidPersistentSystemProcess(callingUid)) { return false; } - // don't abort if the realCallingUid is in the foreground and callingUid isn't - if ((realCallingUid != callingUid) && isUidForeground(realCallingUid)) { + // take realCallingUid into consideration + if (realCallingUid != callingUid) { + // don't abort if the realCallingUid is in the foreground and callingUid isn't + if (isUidForeground(realCallingUid)) { + return false; + } + // if the realCallingUid is a persistent system process, abort if the IntentSender + // wasn't whitelisted to start an activity + if (isUidPersistentSystemProcess(realCallingUid) && (originatingPendingIntent != null) + && allowBackgroundActivityStart) { + return false; + } + } + // don't abort if the caller is currently temporarily whitelisted + if (callerApp != null && callerApp.areBackgroundActivityStartsAllowed()) { return false; } // don't abort if the caller has the same uid as the recents component @@ -924,12 +942,17 @@ class ActivityStarter { return true; } - /** Returns true if uid has a visible window or its process is in top or persistent state. */ + /** Returns true if uid has a visible window or its process is in a top state. */ private boolean isUidForeground(int uid) { - return (mService.getUidStateLocked(uid) <= ActivityManager.PROCESS_STATE_TOP) + return (mService.getUidStateLocked(uid) == ActivityManager.PROCESS_STATE_TOP) || mService.mWindowManager.isAnyWindowVisibleForUid(uid); } + /** Returns true if uid is in a persistent state. */ + private boolean isUidPersistentSystemProcess(int uid) { + return (mService.getUidStateLocked(uid) <= ActivityManager.PROCESS_STATE_PERSISTENT_UI); + } + private void maybeLogActivityStart(int callingUid, String callingPackage, int realCallingUid, Intent intent, WindowProcessController callerApp, ActivityRecord r, PendingIntentRecord originatingPendingIntent, boolean abortedStart) { @@ -1049,7 +1072,7 @@ class ActivityStarter { Configuration globalConfig, SafeActivityOptions options, boolean ignoreTargetSecurity, int userId, TaskRecord inTask, String reason, boolean allowPendingRemoteAnimationRegistryLookup, - PendingIntentRecord originatingPendingIntent) { + PendingIntentRecord originatingPendingIntent, boolean allowBackgroundActivityStart) { // Refuse possible leaked file descriptors if (intent != null && intent.hasFileDescriptors()) { throw new IllegalArgumentException("File descriptors passed in Intent"); @@ -1195,7 +1218,8 @@ class ActivityStarter { voiceSession, voiceInteractor, resultTo, resultWho, requestCode, callingPid, callingUid, callingPackage, realCallingPid, realCallingUid, startFlags, options, ignoreTargetSecurity, componentSpecified, outRecord, inTask, reason, - allowPendingRemoteAnimationRegistryLookup, originatingPendingIntent); + allowPendingRemoteAnimationRegistryLookup, originatingPendingIntent, + allowBackgroundActivityStart); Binder.restoreCallingIdentity(origId); @@ -2731,6 +2755,11 @@ class ActivityStarter { return this; } + ActivityStarter setAllowBackgroundActivityStart(boolean allowBackgroundActivityStart) { + mRequest.allowBackgroundActivityStart = allowBackgroundActivityStart; + return this; + } + void dump(PrintWriter pw, String prefix) { prefix = prefix + " "; pw.print(prefix); diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java index 0fc890a39fed..0f286ce30ccd 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java @@ -197,16 +197,19 @@ public abstract class ActivityTaskManagerInternal { * @param validateIncomingUser Set true to skip checking {@code userId} with the calling UID. * @param originatingPendingIntent PendingIntentRecord that originated this activity start or * null if not originated by PendingIntent + * @param allowBackgroundActivityStart Whether the background activity start should be allowed + * from originatingPendingIntent */ public abstract int startActivitiesInPackage(int uid, String callingPackage, Intent[] intents, String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options, int userId, - boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent); + boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent, + boolean allowBackgroundActivityStart); public abstract int startActivityInPackage(int uid, int realCallingPid, int realCallingUid, String callingPackage, Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode, int startFlags, SafeActivityOptions options, int userId, TaskRecord inTask, String reason, boolean validateIncomingUser, - PendingIntentRecord originatingPendingIntent); + PendingIntentRecord originatingPendingIntent, boolean allowBackgroundActivityStart); /** * Start activity {@code intent} without calling user-id check. diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 86c5d4d1726d..42121ca08696 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -639,7 +639,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } } - ActivityTaskManagerService(Context context) { + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + public ActivityTaskManagerService(Context context) { mContext = context; mFactoryTest = FactoryTest.getMode(); mSystemThread = ActivityThread.currentActivityThread(); @@ -960,7 +961,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { // TODO: Switch to user app stacks here. return getActivityStartController().startActivities(caller, -1, callingPackage, intents, resolvedTypes, resultTo, SafeActivityOptions.fromBundle(bOptions), userId, reason, - null /* originatingPendingIntent */); + null /* originatingPendingIntent */, false /* allowBackgroundActivityStart */); } @Override @@ -5807,18 +5808,20 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { packageUid, packageName, intents, resolvedTypes, null /* resultTo */, SafeActivityOptions.fromBundle(bOptions), userId, - false /* validateIncomingUser */, null /* originatingPendingIntent */); + false /* validateIncomingUser */, null /* originatingPendingIntent */, + false /* allowBackgroundActivityStart */); } } @Override public int startActivitiesInPackage(int uid, String callingPackage, Intent[] intents, String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options, int userId, - boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent) { + boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent, + boolean allowBackgroundActivityStart) { synchronized (mGlobalLock) { return getActivityStartController().startActivitiesInPackage(uid, callingPackage, intents, resolvedTypes, resultTo, options, userId, validateIncomingUser, - originatingPendingIntent); + originatingPendingIntent, allowBackgroundActivityStart); } } @@ -5827,12 +5830,14 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { String callingPackage, Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode, int startFlags, SafeActivityOptions options, int userId, TaskRecord inTask, String reason, boolean validateIncomingUser, - PendingIntentRecord originatingPendingIntent) { + PendingIntentRecord originatingPendingIntent, + boolean allowBackgroundActivityStart) { synchronized (mGlobalLock) { return getActivityStartController().startActivityInPackage(uid, realCallingPid, realCallingUid, callingPackage, intent, resolvedType, resultTo, resultWho, requestCode, startFlags, options, userId, inTask, reason, - validateIncomingUser, originatingPendingIntent); + validateIncomingUser, originatingPendingIntent, + allowBackgroundActivityStart); } } diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index d8b2b5200f0c..a5341ca11784 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -1949,6 +1949,11 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } else if (newTask || !processRunning || (taskSwitch && !activityCreated)) { return STARTING_WINDOW_TYPE_SPLASH_SCREEN; } else if (taskSwitch && allowTaskSnapshot) { + if (mWmService.mLowRamTaskSnapshots) { + // For low RAM devices, we use the splash screen starting window instead of the + // task snapshot starting window. + return STARTING_WINDOW_TYPE_SPLASH_SCREEN; + } return snapshot == null ? STARTING_WINDOW_TYPE_NONE : snapshotOrientationSameAsTask(snapshot) || fromRecents ? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN; diff --git a/services/core/java/com/android/server/wm/BarController.java b/services/core/java/com/android/server/wm/BarController.java index 5b20af3534c4..9bc8462c66e3 100644 --- a/services/core/java/com/android/server/wm/BarController.java +++ b/services/core/java/com/android/server/wm/BarController.java @@ -62,7 +62,8 @@ public class BarController { private StatusBarManagerInternal mStatusBarInternal; protected WindowState mWin; - private int mState = StatusBarManager.WINDOW_STATE_SHOWING; + private @StatusBarManager.WindowVisibleState int mState = + StatusBarManager.WINDOW_STATE_SHOWING; private int mTransientBarState; private boolean mPendingShow; private long mLastTranslucent; @@ -199,7 +200,8 @@ public class BarController { return !mWin.isDrawnLw(); } - private int computeStateLw(boolean wasVis, boolean wasAnim, WindowState win, boolean change) { + private @StatusBarManager.WindowVisibleState int computeStateLw( + boolean wasVis, boolean wasAnim, WindowState win, boolean change) { if (win.isDrawnLw()) { final boolean vis = win.isVisibleLw(); final boolean anim = win.isAnimatingLw(); @@ -218,7 +220,7 @@ public class BarController { return mState; } - private boolean updateStateLw(final int state) { + private boolean updateStateLw(@StatusBarManager.WindowVisibleState final int state) { if (mWin != null && state != mState) { mState = state; if (DEBUG) Slog.d(mTag, "mState: " + StatusBarManager.windowStateToString(state)); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index a5ceee268fa2..fecc8da3d645 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -2506,6 +2506,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo mWmService.mAnimator.removeDisplayLocked(mDisplayId); mWindowingLayer.release(); mOverlayLayer.release(); + mInputMonitor.onDisplayRemoved(); } finally { mDisplayReady = false; mRemovingDisplay = false; diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index fc1c65cf5807..632db3842839 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -32,6 +32,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_POSITION import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import android.graphics.Rect; +import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Process; @@ -45,7 +46,9 @@ import android.view.InputChannel; import android.view.InputEventReceiver; import android.view.InputWindowHandle; import android.view.SurfaceControl; +import android.view.animation.Animation; +import com.android.server.AnimationThread; import com.android.server.policy.WindowManagerPolicy; import java.io.PrintWriter; @@ -60,6 +63,7 @@ final class InputMonitor { // When true, need to call updateInputWindowsLw(). private boolean mUpdateInputWindowsNeeded = true; + private boolean mUpdateInputWindowsPending; // Currently focused input window handle. private InputWindowHandle mFocusedInputWindowHandle; @@ -70,8 +74,11 @@ final class InputMonitor { new UpdateInputForAllWindowsConsumer(); private final int mDisplayId; + private final DisplayContent mDisplayContent; + private boolean mDisplayRemoved; private final SurfaceControl.Transaction mInputTransaction; + private final Handler mHandler; /** * The set of input consumer added to the window manager by name, which consumes input events @@ -105,10 +112,64 @@ final class InputMonitor { } } + private final Runnable mUpdateInputWindows = new Runnable() { + @Override + public void run() { + synchronized (mService.mGlobalLock) { + mUpdateInputWindowsPending = false; + mUpdateInputWindowsNeeded = false; + + if (mDisplayRemoved) { + return; + } + + // Populate the input window list with information about all of the windows that + // could potentially receive input. + // As an optimization, we could try to prune the list of windows but this turns + // out to be difficult because only the native code knows for sure which window + // currently has touch focus. + + // If there's a drag in flight, provide a pseudo-window to catch drag input + final boolean inDrag = mService.mDragDropController.dragDropActiveLocked(); + if (inDrag) { + if (DEBUG_DRAG) { + Log.d(TAG_WM, "Inserting drag window"); + } + mService.mDragDropController.showInputSurface(mInputTransaction, mDisplayId); + } else { + mService.mDragDropController.hideInputSurface(mInputTransaction, mDisplayId); + } + + final boolean inPositioning = + mService.mTaskPositioningController.isPositioningLocked(); + if (inPositioning) { + if (DEBUG_TASK_POSITIONING) { + Log.d(TAG_WM, "Inserting window handle for repositioning"); + } + mService.mTaskPositioningController.showInputSurface(mInputTransaction, + mDisplayId); + } else { + mService.mTaskPositioningController.hideInputSurface(mInputTransaction, + mDisplayId); + } + + // Add all windows on the default display. + mUpdateInputForAllWindowsConsumer.updateInputWindows(inDrag); + } + } + }; + public InputMonitor(WindowManagerService service, int displayId) { mService = service; + mDisplayContent = mService.mRoot.getDisplayContent(displayId); mDisplayId = displayId; - mInputTransaction = mService.mRoot.getDisplayContent(mDisplayId).getPendingTransaction(); + mInputTransaction = mDisplayContent.getPendingTransaction(); + mHandler = AnimationThread.getHandler(); + } + + void onDisplayRemoved() { + mHandler.removeCallbacks(mUpdateInputWindows); + mDisplayRemoved = true; } private void addInputConsumer(String name, InputConsumerImpl consumer) { @@ -248,41 +309,18 @@ final class InputMonitor { if (!force && !mUpdateInputWindowsNeeded) { return; } - mUpdateInputWindowsNeeded = false; - - if (false) Slog.d(TAG_WM, ">>>>>> ENTERED updateInputWindowsLw"); - - // Populate the input window list with information about all of the windows that - // could potentially receive input. - // As an optimization, we could try to prune the list of windows but this turns - // out to be difficult because only the native code knows for sure which window - // currently has touch focus. + scheduleUpdateInputWindows(); + } - // If there's a drag in flight, provide a pseudo-window to catch drag input - final boolean inDrag = mService.mDragDropController.dragDropActiveLocked(); - if (inDrag) { - if (DEBUG_DRAG) { - Log.d(TAG_WM, "Inserting drag window"); - } - mService.mDragDropController.showInputSurface(mInputTransaction, mDisplayId); - } else { - mService.mDragDropController.hideInputSurface(mInputTransaction, mDisplayId); + private void scheduleUpdateInputWindows() { + if (mDisplayRemoved) { + return; } - final boolean inPositioning = mService.mTaskPositioningController.isPositioningLocked(); - if (inPositioning) { - if (DEBUG_TASK_POSITIONING) { - Log.d(TAG_WM, "Inserting window handle for repositioning"); - } - mService.mTaskPositioningController.showInputSurface(mInputTransaction, mDisplayId); - } else { - mService.mTaskPositioningController.hideInputSurface(mInputTransaction, mDisplayId); + if (!mUpdateInputWindowsPending) { + mUpdateInputWindowsPending = true; + mHandler.post(mUpdateInputWindows); } - - // Add all windows on the default display. - mUpdateInputForAllWindowsConsumer.updateInputWindows(inDrag); - - if (false) Slog.d(TAG_WM, "<<<<<<< EXITED updateInputWindowsLw"); } /* Called when the current input focus changes. @@ -385,19 +423,18 @@ final class InputMonitor { mTmpRect.setEmpty(); mDisableWallpaperTouchEvents = false; this.inDrag = inDrag; - final DisplayContent dc = mService.mRoot.getDisplayContent(mDisplayId); - wallpaperController = dc.mWallpaperController; + wallpaperController = mDisplayContent.mWallpaperController; resetInputConsumers(mInputTransaction); - dc.forAllWindows(this, + mDisplayContent.forAllWindows(this, true /* traverseTopToBottom */); if (mAddWallpaperInputConsumerHandle) { wallpaperInputConsumer.show(mInputTransaction, 0); } - dc.scheduleAnimation(); + mDisplayContent.scheduleAnimation(); Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); } diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java index 49a3186be9b4..d6f161645327 100644 --- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java @@ -18,7 +18,6 @@ package com.android.server.wm; import android.annotation.NonNull; import android.annotation.Nullable; -import android.graphics.Point; import android.graphics.Rect; import android.util.proto.ProtoOutputStream; import android.view.InsetsState; @@ -26,8 +25,10 @@ import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; import android.view.InsetsSource; import android.view.InsetsSourceControl; +import android.view.ViewRootImpl; import com.android.internal.util.function.TriConsumer; +import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback; import java.io.PrintWriter; @@ -106,8 +107,8 @@ class InsetsSourceProvider { mTmpRect.inset(mWin.mGivenContentInsets); } mSource.setFrame(mTmpRect); - setServerVisible(mWin.isVisible() && !mWin.mGivenInsetsPending); - + setServerVisible(mWin.wouldBeVisibleIfPolicyIgnored() && mWin.mPolicyVisibility + && !mWin.mGivenInsetsPending); } void updateControlForTarget(@Nullable WindowState target) { @@ -115,15 +116,15 @@ class InsetsSourceProvider { return; } if (target == null) { - revokeControl(); + // Cancelling the animation will invoke onAnimationCancelled, resetting all the fields. + mWin.cancelAnimation(); return; } mAdapter = new ControlAdapter(); mWin.startAnimation(mDisplayContent.getPendingTransaction(), mAdapter, - false /* TODO hidden */); + !mClientVisible /* hidden */); mControllingWin = target; mControl = new InsetsSourceControl(mSource.getType(), mAdapter.mCapturedLeash); - setClientVisible(InsetsState.getDefaultVisibly(mSource.getType())); } boolean onInsetsModified(WindowState caller, InsetsSource modifiedSource) { @@ -135,7 +136,12 @@ class InsetsSourceProvider { } private void setClientVisible(boolean clientVisible) { + if (mClientVisible == clientVisible) { + return; + } mClientVisible = clientVisible; + mDisplayContent.mWmService.mH.sendMessage(PooledLambda.obtainMessage( + DisplayContent::layoutAndAssignWindowLayersIfNeeded, mDisplayContent)); updateVisibility(); } @@ -152,13 +158,8 @@ class InsetsSourceProvider { return mControl; } - void revokeControl() { - if (mControllingWin != null) { - - // Cancelling the animation will invoke onAnimationCancelled, resetting all the fields. - mWin.cancelAnimation(); - } - setClientVisible(InsetsState.getDefaultVisibly(mSource.getType())); + boolean isClientVisible() { + return !ViewRootImpl.USE_NEW_INSETS || mClientVisible; } private class ControlAdapter implements AnimationAdapter { @@ -186,6 +187,7 @@ class InsetsSourceProvider { public void onAnimationCancelled(SurfaceControl animationLeash) { if (mAdapter == this) { mStateController.notifyControlRevoked(mControllingWin, InsetsSourceProvider.this); + setClientVisible(InsetsState.getDefaultVisibly(mSource.getType())); mControl = null; mControllingWin = null; mAdapter = null; diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java index 8e119bb195d6..cc57b932092c 100644 --- a/services/core/java/com/android/server/wm/InsetsStateController.java +++ b/services/core/java/com/android/server/wm/InsetsStateController.java @@ -218,5 +218,11 @@ class InsetsStateController { void dump(String prefix, PrintWriter pw) { pw.println(prefix + "WindowInsetsStateController"); mState.dump(prefix + " ", pw); + pw.println(prefix + " " + "Control map:"); + for (int i = mTypeWinControlMap.size() - 1; i >= 0; i--) { + pw.print(prefix + " "); + pw.println(InsetsState.typeToString(mTypeWinControlMap.keyAt(i)) + " -> " + + mTypeWinControlMap.valueAt(i)); + } } } diff --git a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java index 5107b522c33b..6acd8641271c 100644 --- a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java +++ b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java @@ -219,10 +219,16 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { } } - if (launchMode == WINDOWING_MODE_FREEFORM && !currentParams.mBounds.isEmpty()) { + if (!currentParams.mBounds.isEmpty()) { + // Carry over bounds from callers regardless of launch mode because bounds is still + // used to restore last non-fullscreen bounds when launch mode is not freeform. + // Therefore it's not a resolution step for non-freeform launch mode and only + // consider it fully resolved only when launch mode is freeform. outParams.mBounds.set(currentParams.mBounds); - fullyResolvedCurrentParam = true; - if (DEBUG) appendLog("inherit-bounds=" + outParams.mBounds); + if (launchMode == WINDOWING_MODE_FREEFORM) { + fullyResolvedCurrentParam = true; + if (DEBUG) appendLog("inherit-bounds=" + outParams.mBounds); + } } } @@ -305,6 +311,13 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { displayId = optionLaunchId; } + // If the source activity is a no-display activity, pass on the launch display id from + // source activity as currently preferred. + if (displayId == INVALID_DISPLAY && source != null && source.noDisplay) { + displayId = source.mHandoverLaunchDisplayId; + if (DEBUG) appendLog("display-from-no-display-source=" + displayId); + } + ActivityStack stack = (displayId == INVALID_DISPLAY && task != null) ? task.getStack() : null; if (stack != null) { diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java index f1b0c0696353..e3433228f2de 100644 --- a/services/core/java/com/android/server/wm/TaskRecord.java +++ b/services/core/java/com/android/server/wm/TaskRecord.java @@ -911,7 +911,6 @@ class TaskRecord extends ConfigurationContainer { info.packageName, info.targetActivity); if (_intent != null) { Intent targetIntent = new Intent(_intent); - targetIntent.setComponent(targetComponent); targetIntent.setSelector(null); targetIntent.setSourceBounds(null); if (DEBUG_TASKS) Slog.v(TAG_TASKS, diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 6a15d97ae916..caa72fa62072 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -433,6 +433,12 @@ public class WindowManagerService extends IWindowManager.Stub final long mDrawLockTimeoutMillis; final boolean mAllowAnimationsInLowPowerMode; + /** + * Use very low resolution task snapshots. Replaces task snapshot starting windows with + * splashscreen starting windows. Used on low RAM devices to save memory. + */ + final boolean mLowRamTaskSnapshots; + final boolean mAllowBootMessages; final boolean mLimitedAlphaCompositing; @@ -949,6 +955,8 @@ public class WindowManagerService extends IWindowManager.Stub com.android.internal.R.bool.config_disableTransitionAnimation); mPerDisplayFocusEnabled = context.getResources().getBoolean( com.android.internal.R.bool.config_perDisplayFocusEnabled); + mLowRamTaskSnapshots = context.getResources().getBoolean( + com.android.internal.R.bool.config_lowRamTaskSnapshotsAndRecents); mInputManager = inputManager; // Must be before createDisplayContentLocked. mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class); mDisplayWindowSettings = new DisplayWindowSettings(this); diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java index f7f7528c5234..c38a974ac774 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -141,6 +141,9 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio private volatile boolean mPerceptible; // Set to true when process was launched with a wrapper attached private volatile boolean mUsingWrapper; + // Set to true if this process is currently temporarily whitelisted to start activities even if + // it's not in the foreground + private volatile boolean mAllowBackgroundActivityStarts; // Thread currently set for VR scheduling int mVrThreadTid; @@ -343,6 +346,14 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio return mUsingWrapper; } + public void setAllowBackgroundActivityStarts(boolean allowBackgroundActivityStarts) { + mAllowBackgroundActivityStarts = allowBackgroundActivityStarts; + } + + public boolean areBackgroundActivityStartsAllowed() { + return mAllowBackgroundActivityStarts; + } + public void setInstrumenting(boolean instrumenting) { mInstrumenting = instrumenting; } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index e78c12cfcc78..cd29b3c29248 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1373,12 +1373,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP @Override boolean isVisible() { - return wouldBeVisibleIfPolicyIgnored() && mPolicyVisibility; + return wouldBeVisibleIfPolicyIgnored() && mPolicyVisibility + // If we don't have a provider, this window isn't used as a window generating + // insets, so nobody can hide it over the inset APIs. + && (mInsetProvider == null || mInsetProvider.isClientVisible()); } /** - * @return True if the window would be visible if we'd ignore policy visibility, false - * otherwise. + * @return {@code true} if the window would be visible if we'd ignore policy visibility, + * {@code false} otherwise. */ boolean wouldBeVisibleIfPolicyIgnored() { return mHasSurface && !isParentWindowHidden() diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 855fb508ec64..be09aea65073 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -783,7 +783,7 @@ public final class SystemServer { // Manages apk rollbacks. traceBeginAndSlog("StartRollbackManagerService"); - mSystemServiceManager.startService(RollbackManagerService.Lifecycle.class); + mSystemServiceManager.startService(RollbackManagerService.class); traceEnd(); } diff --git a/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java index b8723c520cf8..b682def9c224 100644 --- a/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java +++ b/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.robolectric.Shadows.shadowOf; import static org.testng.Assert.expectThrows; @@ -192,6 +193,19 @@ public class BackupManagerServiceTest { /** Test that the service unregisters users when stopped. */ @Test + public void testStopServiceForUser_forRegisteredUser_tearsDownCorrectUser() throws Exception { + BackupManagerService backupManagerService = + createServiceAndRegisterUser(mUserOneId, mUserOneService); + backupManagerService.startServiceForUser(mUserTwoId, mUserTwoService); + + backupManagerService.stopServiceForUser(mUserOneId); + + verify(mUserOneService).tearDownService(); + verifyNoMoreInteractions(mUserTwoService); + } + + /** Test that the service unregisters users when stopped. */ + @Test public void testStopServiceForUser_forUnknownUser_doesNothing() throws Exception { BackupManagerService backupManagerService = createService(); diff --git a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java index bb60c27a2543..8d5c301d93e7 100644 --- a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -829,7 +829,7 @@ public class UserBackupManagerServiceTest { public void testRequestBackup_whenNotProvisioned() throws Exception { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); UserBackupManagerService backupManagerService = createUserBackupManagerServiceAndRunTasks(); - backupManagerService.setProvisioned(false); + backupManagerService.setSetupComplete(false); int result = backupManagerService.requestBackup(new String[] {PACKAGE_1}, mObserver, 0); @@ -848,7 +848,7 @@ public class UserBackupManagerServiceTest { setUpCurrentTransport(mTransportManager, mTransport.unregistered()); UserBackupManagerService backupManagerService = createUserBackupManagerServiceAndRunTasks(); backupManagerService.setEnabled(true); - backupManagerService.setProvisioned(true); + backupManagerService.setSetupComplete(true); int result = backupManagerService.requestBackup(new String[] {PACKAGE_1}, mObserver, 0); @@ -868,7 +868,7 @@ public class UserBackupManagerServiceTest { setUpCurrentTransport(mTransportManager, mTransport); UserBackupManagerService backupManagerService = createUserBackupManagerServiceAndRunTasks(); backupManagerService.setEnabled(true); - backupManagerService.setProvisioned(true); + backupManagerService.setSetupComplete(true); // Haven't set PACKAGE_1 as eligible int result = backupManagerService.requestBackup(new String[] {PACKAGE_1}, mObserver, 0); @@ -965,14 +965,13 @@ public class UserBackupManagerServiceTest { private UserBackupManagerService createBackupManagerServiceForRequestBackup() { UserBackupManagerService backupManagerService = createUserBackupManagerServiceAndRunTasks(); backupManagerService.setEnabled(true); - backupManagerService.setProvisioned(true); + backupManagerService.setSetupComplete(true); return backupManagerService; } /** - * Test verifying that {@link UserBackupManagerService#createAndInitializeService(Context, - * Trampoline, HandlerThread, File, File, TransportManager)} posts a transport registration task - * to the backup thread. + * Test verifying that creating a new instance posts a transport registration task to the backup + * thread. */ @Test public void testCreateAndInitializeService_postRegisterTransports() { @@ -992,9 +991,8 @@ public class UserBackupManagerServiceTest { } /** - * Test verifying that {@link UserBackupManagerService#createAndInitializeService(Context, - * Trampoline, HandlerThread, File, File, TransportManager)} does not directly register - * transports on the main thread. + * Test verifying that creating a new instance does not directly register transports on the main + * thread. */ @Test public void testCreateAndInitializeService_doesNotRegisterTransportsSynchronously() { @@ -1013,11 +1011,7 @@ public class UserBackupManagerServiceTest { verify(mTransportManager, never()).registerTransports(); } - /** - * Test checking non-null argument on {@link - * UserBackupManagerService#createAndInitializeService(Context, Trampoline, HandlerThread, File, - * File, TransportManager)}. - */ + /** Test checking non-null argument on instance creation. */ @Test public void testCreateAndInitializeService_withNullContext_throws() { expectThrows( @@ -1033,11 +1027,7 @@ public class UserBackupManagerServiceTest { mTransportManager)); } - /** - * Test checking non-null argument on {@link - * UserBackupManagerService#createAndInitializeService(Context, Trampoline, HandlerThread, File, - * File, TransportManager)}. - */ + /** Test checking non-null argument on instance creation. */ @Test public void testCreateAndInitializeService_withNullTrampoline_throws() { expectThrows( @@ -1053,11 +1043,7 @@ public class UserBackupManagerServiceTest { mTransportManager)); } - /** - * Test checking non-null argument on {@link - * UserBackupManagerService#createAndInitializeService(Context, Trampoline, HandlerThread, File, - * File, TransportManager)}. - */ + /** Test checking non-null argument on instance creation. */ @Test public void testCreateAndInitializeService_withNullBackupThread_throws() { expectThrows( @@ -1073,11 +1059,7 @@ public class UserBackupManagerServiceTest { mTransportManager)); } - /** - * Test checking non-null argument on {@link - * UserBackupManagerService#createAndInitializeService(Context, Trampoline, HandlerThread, File, - * File, TransportManager)}. - */ + /** Test checking non-null argument on instance creation. */ @Test public void testCreateAndInitializeService_withNullStateDir_throws() { expectThrows( diff --git a/services/robotests/backup/src/com/android/server/backup/internal/SetupObserverTest.java b/services/robotests/backup/src/com/android/server/backup/internal/SetupObserverTest.java new file mode 100644 index 000000000000..b56b5e6132d5 --- /dev/null +++ b/services/robotests/backup/src/com/android/server/backup/internal/SetupObserverTest.java @@ -0,0 +1,141 @@ +/* + * 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.backup.internal; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.os.Handler; +import android.os.HandlerThread; +import android.platform.test.annotations.Presubmit; +import android.provider.Settings; + +import com.android.server.backup.KeyValueBackupJob; +import com.android.server.backup.TransportManager; +import com.android.server.backup.UserBackupManagerService; +import com.android.server.backup.testing.BackupManagerServiceTestUtils; +import com.android.server.backup.testing.TestUtils; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +import java.io.File; + +/** + * Tests verifying the interaction between {@link SetupObserver} and {@link + * UserBackupManagerService}. + */ +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class SetupObserverTest { + private static final String TAG = "SetupObserverTest"; + private static final int USER_ID = 10; + + @Mock private TransportManager mTransportManager; + + private Context mContext; + private UserBackupManagerService mUserBackupManagerService; + private HandlerThread mHandlerThread; + + /** Setup state. */ + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mHandlerThread = BackupManagerServiceTestUtils.startSilentBackupThread(TAG); + mUserBackupManagerService = + BackupManagerServiceTestUtils.createUserBackupManagerServiceAndRunTasks( + USER_ID, + mContext, + mHandlerThread, + new File(mContext.getDataDir(), "test1"), + new File(mContext.getDataDir(), "test2"), + mTransportManager); + } + + /** Test observer handles changes from not setup -> setup correctly. */ + @Test + public void testOnChange_whenNewlySetup_updatesState() throws Exception { + SetupObserver setupObserver = new SetupObserver(mUserBackupManagerService, new Handler()); + mUserBackupManagerService.setSetupComplete(false); + changeSetupCompleteSettingForUser(true, USER_ID); + + setupObserver.onChange(true); + + assertThat(mUserBackupManagerService.isSetupComplete()).isTrue(); + } + + /** Test observer handles changes from setup -> not setup correctly. */ + @Test + public void testOnChange_whenPreviouslySetup_doesNotUpdateState() throws Exception { + SetupObserver setupObserver = new SetupObserver(mUserBackupManagerService, new Handler()); + mUserBackupManagerService.setSetupComplete(true); + changeSetupCompleteSettingForUser(false, USER_ID); + + setupObserver.onChange(true); + + assertThat(mUserBackupManagerService.isSetupComplete()).isTrue(); + } + + /** Test observer handles changes from not setup -> not setup correctly. */ + @Test + public void testOnChange_whenNotPreviouslySetup_doesNotUpdateStateIfNoChange() + throws Exception { + SetupObserver setupObserver = new SetupObserver(mUserBackupManagerService, new Handler()); + mUserBackupManagerService.setSetupComplete(false); + changeSetupCompleteSettingForUser(false, USER_ID); + + setupObserver.onChange(true); + + assertThat(mUserBackupManagerService.isSetupComplete()).isFalse(); + } + + /** Test observer handles changes from not setup -> setup correctly. */ + @Test + public void testOnChange_whenNewlySetup_schedulesBackup() throws Exception { + SetupObserver setupObserver = new SetupObserver(mUserBackupManagerService, new Handler()); + mUserBackupManagerService.setSetupComplete(false); + changeSetupCompleteSettingForUser(true, USER_ID); + // Setup conditions for a full backup job to be scheduled. + mUserBackupManagerService.setEnabled(true); + mUserBackupManagerService.enqueueFullBackup("testPackage", /* lastBackedUp */ 0); + // Clear the handler of all pending tasks. This is to prevent the below assertion on the + // handler from encountering false positives due to other tasks being scheduled as part of + // setup work. + TestUtils.runToEndOfTasks(mHandlerThread.getLooper()); + + setupObserver.onChange(true); + + assertThat(KeyValueBackupJob.isScheduled()).isTrue(); + // Verifies that the full backup job is scheduled. The job is scheduled via a posted message + // on the backup handler so we verify that a message exists. + assertThat(mUserBackupManagerService.getBackupHandler().hasMessagesOrCallbacks()).isTrue(); + } + + private void changeSetupCompleteSettingForUser(boolean value, int userId) { + Settings.Secure.putIntForUser( + mContext.getContentResolver(), + Settings.Secure.USER_SETUP_COMPLETE, + value ? 1 : 0, + userId); + } +} diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java index 767eb60de4f8..6a10ff487d2d 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java @@ -29,6 +29,8 @@ import static android.app.ActivityManager.PROCESS_STATE_SERVICE; import static android.app.ActivityManager.PROCESS_STATE_TOP; import static android.util.DebugUtils.valueToString; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; + import static com.android.server.am.ActivityManagerInternalTest.CustomThread; import static com.android.server.am.ActivityManagerService.DISPATCH_UIDS_CHANGED_UI_MSG; import static com.android.server.am.ActivityManagerService.Injector; @@ -69,6 +71,9 @@ import androidx.test.filters.MediumTest; import androidx.test.filters.SmallTest; import com.android.server.AppOpsService; +import com.android.server.am.ProcessList.IsolatedUidRange; +import com.android.server.am.ProcessList.IsolatedUidRangeAllocator; +import com.android.server.wm.ActivityTaskManagerService; import org.junit.After; import org.junit.Before; @@ -109,7 +114,7 @@ public class ActivityManagerServiceTest { UidRecord.CHANGE_ACTIVE }; - @Mock private Context mContext; + private Context mContext = getInstrumentation().getTargetContext(); @Mock private AppOpsService mAppOpsService; @Mock private PackageManager mPackageManager; @@ -128,8 +133,8 @@ public class ActivityManagerServiceTest { mInjector = new TestInjector(); mAms = new ActivityManagerService(mInjector); mAms.mWaitForNetworkTimeoutMs = 2000; - - when(mContext.getPackageManager()).thenReturn(mPackageManager); + mAms.mActivityTaskManager = new ActivityTaskManagerService(mContext); + mAms.mActivityTaskManager.initialize(null, null, mHandler.getLooper()); } @After @@ -291,6 +296,113 @@ public class ActivityManagerServiceTest { } } + private void validateAppZygoteIsolatedUidRange(IsolatedUidRange uidRange) { + assertNotNull(uidRange); + assertTrue(uidRange.mFirstUid >= Process.FIRST_APP_ZYGOTE_ISOLATED_UID + && uidRange.mFirstUid <= Process.LAST_APP_ZYGOTE_ISOLATED_UID); + assertTrue(uidRange.mLastUid >= Process.FIRST_APP_ZYGOTE_ISOLATED_UID + && uidRange.mLastUid <= Process.LAST_APP_ZYGOTE_ISOLATED_UID); + assertTrue(uidRange.mLastUid > uidRange.mFirstUid + && ((uidRange.mLastUid - uidRange.mFirstUid + 1) + == Process.NUM_UIDS_PER_APP_ZYGOTE)); + } + + private void verifyUidRangesNoOverlap(IsolatedUidRange uidRange1, IsolatedUidRange uidRange2) { + IsolatedUidRange lowRange = uidRange1.mFirstUid <= uidRange2.mFirstUid ? uidRange1 : uidRange2; + IsolatedUidRange highRange = lowRange == uidRange1 ? uidRange2 : uidRange1; + + assertTrue(highRange.mFirstUid > lowRange.mLastUid); + } + + @Test + public void testIsolatedUidRangeAllocator() { + final IsolatedUidRangeAllocator allocator = mAms.mProcessList.mAppIsolatedUidRangeAllocator; + + // Create initial range + ApplicationInfo appInfo = new ApplicationInfo(); + appInfo.processName = "com.android.test.app"; + appInfo.uid = 10000; + final IsolatedUidRange range = allocator.getOrCreateIsolatedUidRangeLocked(appInfo); + validateAppZygoteIsolatedUidRange(range); + verifyIsolatedUidAllocator(range); + + // Create a second range + ApplicationInfo appInfo2 = new ApplicationInfo(); + appInfo2.processName = "com.android.test.app2"; + appInfo2.uid = 10001; + IsolatedUidRange range2 = allocator.getOrCreateIsolatedUidRangeLocked(appInfo2); + validateAppZygoteIsolatedUidRange(range2); + verifyIsolatedUidAllocator(range2); + + // Verify ranges don't overlap + verifyUidRangesNoOverlap(range, range2); + + // Free range, reallocate and verify + allocator.freeUidRangeLocked(appInfo2); + range2 = allocator.getOrCreateIsolatedUidRangeLocked(appInfo2); + validateAppZygoteIsolatedUidRange(range2); + verifyUidRangesNoOverlap(range, range2); + verifyIsolatedUidAllocator(range2); + + // Free both, then try to allocate the maximum number of UID ranges + allocator.freeUidRangeLocked(appInfo); + allocator.freeUidRangeLocked(appInfo2); + + int maxNumUidRanges = (Process.LAST_APP_ZYGOTE_ISOLATED_UID + - Process.FIRST_APP_ZYGOTE_ISOLATED_UID + 1) / Process.NUM_UIDS_PER_APP_ZYGOTE; + for (int i = 0; i < maxNumUidRanges; i++) { + appInfo = new ApplicationInfo(); + appInfo.uid = 10000 + i; + appInfo.processName = "com.android.test.app" + Integer.toString(i); + IsolatedUidRange uidRange = allocator.getOrCreateIsolatedUidRangeLocked(appInfo); + validateAppZygoteIsolatedUidRange(uidRange); + verifyIsolatedUidAllocator(uidRange); + } + + // Try to allocate another one and make sure it fails + appInfo = new ApplicationInfo(); + appInfo.uid = 9000; + appInfo.processName = "com.android.test.app.failed"; + IsolatedUidRange failedRange = allocator.getOrCreateIsolatedUidRangeLocked(appInfo); + + assertNull(failedRange); + } + + public void verifyIsolatedUid(ProcessList.IsolatedUidRange range, int uid) { + assertTrue(uid >= range.mFirstUid && uid <= range.mLastUid); + } + + public void verifyIsolatedUidAllocator(ProcessList.IsolatedUidRange range) { + int uid = range.allocateIsolatedUidLocked(0); + verifyIsolatedUid(range, uid); + + int uid2 = range.allocateIsolatedUidLocked(0); + verifyIsolatedUid(range, uid2); + assertTrue(uid2 != uid); + + // Free both + range.freeIsolatedUidLocked(uid); + range.freeIsolatedUidLocked(uid2); + + // Allocate the entire range + for (int i = 0; i < (range.mLastUid - range.mFirstUid + 1); ++i) { + uid = range.allocateIsolatedUidLocked(0); + verifyIsolatedUid(range, uid); + } + + // Ensure the next one fails + uid = range.allocateIsolatedUidLocked(0); + assertEquals(uid, -1); + } + + @Test + public void testGlobalIsolatedUidAllocator() { + final IsolatedUidRange globalUidRange = mAms.mProcessList.mGlobalIsolatedUids; + assertEquals(globalUidRange.mFirstUid, Process.FIRST_ISOLATED_UID); + assertEquals(globalUidRange.mLastUid, Process.LAST_ISOLATED_UID); + verifyIsolatedUidAllocator(globalUidRange); + } + @Test public void testBlockStateForUid() { final UidRecord uidRec = new UidRecord(TEST_UID, null /* atmInternal */); diff --git a/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java b/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java index 0889265dd663..d4bb6369c710 100644 --- a/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java +++ b/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java @@ -193,6 +193,7 @@ public class BroadcastRecordTest { false /* serialized */, false /* sticky */, false /* initialSticky */, - userId); + userId, + false /* allowBackgroundActivityStarts */); } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java index 9d847514435e..20c5f5dd63dc 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -60,6 +60,7 @@ import android.os.UserHandle; import android.os.VibrationEffect; import android.os.Vibrator; import android.provider.Settings; +import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; @@ -114,7 +115,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { private static final Uri CUSTOM_SOUND = Settings.System.DEFAULT_ALARM_ALERT_URI; private static final AudioAttributes CUSTOM_ATTRIBUTES = new AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN) - .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE) + .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION) .build(); private static final int CUSTOM_LIGHT_COLOR = Color.BLACK; private static final int CUSTOM_LIGHT_ON = 10000; @@ -237,11 +238,11 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { false /* noisy */, false /* buzzy*/, true /* lights */); } - private NotificationRecord getCustomLightsNotification() { - return getNotificationRecord(mId, false /* insistent */, true /* once */, - false /* noisy */, true /* buzzy*/, true /* lights */, - true /* defaultVibration */, true /* defaultSound */, false /* defaultLights */, - null, Notification.GROUP_ALERT_ALL, false); + private NotificationRecord getCallRecord(int id, boolean insistent) { + return getNotificationRecord(id, false, false /* once */, true /* noisy */, + false /* buzzy */, false /* lights */, false /* default vib */, + false /* default sound */, false /* default lights */, "", + Notification.GROUP_ALERT_ALL, false); } private NotificationRecord getNotificationRecord(int id, boolean insistent, boolean once, @@ -351,11 +352,6 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { eq(false), (AudioAttributes) anyObject()); } - private void verifyCustomBeep() throws RemoteException { - verify(mRingtonePlayer, times(1)).playAsync(eq(CUSTOM_SOUND), (UserHandle) anyObject(), - eq(false), (AudioAttributes) anyObject()); - } - private void verifyNeverStopAudio() throws RemoteException { verify(mRingtonePlayer, never()).stopAsync(); } @@ -1015,22 +1011,6 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { } @Test - public void testCanceledNoisyNeverVibrate() throws Exception { - NotificationRecord r = getBuzzyBeepyNotification(); - - final int waitMs = mAudioManager.getFocusRampTimeMs( - AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK, - r.getAudioAttributes()); - - mService.buzzBeepBlinkLocked(r); - mService.clearNotifications(); - - verifyNeverVibrate(); - Thread.sleep(waitMs); - verifyNeverVibrate(); - } - - @Test public void testEmptyUriSoundTreatedAsNoSound() throws Exception { NotificationChannel channel = new NotificationChannel("test", "test", IMPORTANCE_HIGH); channel.setSound(Uri.EMPTY, null); @@ -1293,6 +1273,64 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { assertEquals(-1, group.getLastAudiblyAlertedMs()); } + @Test + public void testListenerHintCall() throws Exception { + NotificationRecord r = getCallRecord(1, true); + + mService.setHints(NotificationListenerService.HINT_HOST_DISABLE_CALL_EFFECTS); + + mService.buzzBeepBlinkLocked(r); + + verifyNeverBeep(); + } + + @Test + public void testListenerHintCall_notificationSound() throws Exception { + NotificationRecord r = getBeepyNotification(); + + mService.setHints(NotificationListenerService.HINT_HOST_DISABLE_CALL_EFFECTS); + + mService.buzzBeepBlinkLocked(r); + + verifyBeepLooped(); + } + + @Test + public void testListenerHintNotification() throws Exception { + NotificationRecord r = getBeepyNotification(); + + mService.setHints(NotificationListenerService.HINT_HOST_DISABLE_NOTIFICATION_EFFECTS); + + mService.buzzBeepBlinkLocked(r); + + verifyNeverBeep(); + } + + @Test + public void testListenerHintBoth() throws Exception { + NotificationRecord r = getCallRecord(1, true); + NotificationRecord s = getBeepyNotification(); + + mService.setHints(NotificationListenerService.HINT_HOST_DISABLE_NOTIFICATION_EFFECTS + | NotificationListenerService.HINT_HOST_DISABLE_CALL_EFFECTS); + + mService.buzzBeepBlinkLocked(r); + mService.buzzBeepBlinkLocked(s); + + verifyNeverBeep(); + } + + @Test + public void testListenerHintNotification_callSound() throws Exception { + NotificationRecord r = getCallRecord(1, true); + + mService.setHints(NotificationListenerService.HINT_HOST_DISABLE_NOTIFICATION_EFFECTS); + + mService.buzzBeepBlinkLocked(r); + + verifyBeepLooped(); + } + static class VibrateRepeatMatcher implements ArgumentMatcher<VibrationEffect> { private final int mRepeatIndex; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java index 659c6e7aeed3..8b65e763b088 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java @@ -859,6 +859,19 @@ public class ManagedServicesTest extends UiServiceTestCase { assertTrue(componentsToBind.get(10).contains(ComponentName.unflattenFromString("c/c"))); } + @Test + public void testOnPackagesChanged_nullValuesPassed_noNullPointers() { + for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) { + ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles, + mIpm, approvalLevel); + // null uid list + service.onPackagesChanged(true, new String[]{"this.is.a.package.name"}, null); + + // null package list + service.onPackagesChanged(true, null, new int[]{103}); + } + } + private void loadXml(ManagedServices service) throws Exception { final StringBuffer xml = new StringBuffer(); xml.append("<" + service.getConfig().xmlTag + ">\n"); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java index 65e640f5f73c..1458266089c5 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java @@ -825,4 +825,24 @@ public class NotificationRecordTest extends UiServiceTestCase { assertNotEquals(-1, record.getLastAudiblyAlertedMs()); } + + @Test + public void testIsNewEnoughForAlerting_new() { + StatusBarNotification sbn = getNotification(PKG_O, true /* noisy */, + true /* defaultSound */, false /* buzzy */, false /* defaultBuzz */, + false /* lights */, false /* defaultLights */, groupId /* group */); + NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel); + + assertTrue(record.isNewEnoughForAlerting(record.mUpdateTimeMs)); + } + + @Test + public void testIsNewEnoughForAlerting_old() { + StatusBarNotification sbn = getNotification(PKG_O, true /* noisy */, + true /* defaultSound */, false /* buzzy */, false /* defaultBuzz */, + false /* lights */, false /* defaultLights */, groupId /* group */); + NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel); + + assertFalse(record.isNewEnoughForAlerting(record.mUpdateTimeMs + (1000 * 60 * 60))); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java index 49f134fdeac0..174c5fa6a51e 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java @@ -299,6 +299,59 @@ public class SnoozeHelperTest extends UiServiceTestCase { assertEquals(1, mSnoozeHelper.getSnoozed(UserHandle.USER_SYSTEM, "pkg").size()); } + @Test + public void testClearData() { + // snooze 2 from same package + NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); + NotificationRecord r2 = getNotificationRecord("pkg", 2, "two", UserHandle.SYSTEM); + mSnoozeHelper.snooze(r, 1000); + mSnoozeHelper.snooze(r2, 1000); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r2.sbn.getPackageName(), r2.getKey())); + + // clear data + mSnoozeHelper.clearData(UserHandle.USER_SYSTEM, "pkg"); + + // nothing snoozed; alarms canceled + assertFalse(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); + assertFalse(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r2.sbn.getPackageName(), r2.getKey())); + // twice for initial snooze, twice for canceling the snooze + verify(mAm, times(4)).cancel(any(PendingIntent.class)); + } + + @Test + public void testClearData_otherRecordsUntouched() { + // 2 packages, 2 users + NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); + NotificationRecord r2 = getNotificationRecord("pkg", 2, "two", UserHandle.ALL); + NotificationRecord r3 = getNotificationRecord("pkg2", 3, "three", UserHandle.SYSTEM); + mSnoozeHelper.snooze(r, 1000); + mSnoozeHelper.snooze(r2, 1000); + mSnoozeHelper.snooze(r3, 1000); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_ALL, r2.sbn.getPackageName(), r2.getKey())); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r3.sbn.getPackageName(), r3.getKey())); + + // clear data + mSnoozeHelper.clearData(UserHandle.USER_SYSTEM, "pkg"); + + assertFalse(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_ALL, r2.sbn.getPackageName(), r2.getKey())); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r3.sbn.getPackageName(), r3.getKey())); + // once for each initial snooze, once for canceling one snooze + verify(mAm, times(4)).cancel(any(PendingIntent.class)); + } + private NotificationRecord getNotificationRecord(String pkg, int id, String tag, UserHandle user, String groupKey, boolean groupSummary) { Notification n = new Notification.Builder(getContext(), TEST_CHANNEL_ID) diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 61e968d6da00..7a6b2b50d1e1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -565,7 +565,7 @@ public class ActivityStarterTests extends ActivityTestsBase { runAndVerifyBackgroundActivityStartsSubtest("allowed_noStartsAborted", false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - false, false); + false, false, false); } /** @@ -580,7 +580,7 @@ public class ActivityStarterTests extends ActivityTestsBase { "disallowed_unsupportedUsecase_aborted", true, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - false, false); + false, false, false); } /** @@ -595,47 +595,53 @@ public class ActivityStarterTests extends ActivityTestsBase { runAndVerifyBackgroundActivityStartsSubtest("disallowed_rootUid_notAborted", false, Process.ROOT_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - false, false); + false, false, false); runAndVerifyBackgroundActivityStartsSubtest("disallowed_systemUid_notAborted", false, Process.SYSTEM_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - false, false); + false, false, false); runAndVerifyBackgroundActivityStartsSubtest( "disallowed_callingUidHasVisibleWindow_notAborted", false, UNIMPORTANT_UID, true, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - false, false); + false, false, false); runAndVerifyBackgroundActivityStartsSubtest( "disallowed_callingUidProcessStateTop_notAborted", false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - false, false); + false, false, false); runAndVerifyBackgroundActivityStartsSubtest( "disallowed_realCallingUidHasVisibleWindow_notAborted", false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, true, PROCESS_STATE_TOP + 1, - false, false); + false, false, false); runAndVerifyBackgroundActivityStartsSubtest( "disallowed_realCallingUidProcessStateTop_notAborted", false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP, - false, false); + false, false, false); runAndVerifyBackgroundActivityStartsSubtest( "disallowed_hasForegroundActivities_notAborted", false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - true, false); + true, false, false); runAndVerifyBackgroundActivityStartsSubtest( "disallowed_callerIsRecents_notAborted", false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, - false, true); + false, true, false); + runAndVerifyBackgroundActivityStartsSubtest( + "disallowed_callerIsWhitelisted_notAborted", false, + UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, + UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1, + false, false, true); } private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted, int callingUid, boolean callingUidHasVisibleWindow, int callingUidProcState, int realCallingUid, boolean realCallingUidHasVisibleWindow, int realCallingUidProcState, - boolean hasForegroundActivities, boolean callerIsRecents) { + boolean hasForegroundActivities, boolean callerIsRecents, + boolean callerIsTempWhitelisted) { // window visibility doReturn(callingUidHasVisibleWindow).when(mService.mWindowManager).isAnyWindowVisibleForUid( callingUid); @@ -656,6 +662,8 @@ public class ActivityStarterTests extends ActivityTestsBase { RecentTasks recentTasks = mock(RecentTasks.class); mService.mStackSupervisor.setRecentTasks(recentTasks); doReturn(callerIsRecents).when(recentTasks).isCallerRecents(callingUid); + // caller is temp whitelisted + callerApp.setAllowBackgroundActivityStarts(callerIsTempWhitelisted); final ActivityOptions options = spy(ActivityOptions.makeBasic()); ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK) diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java index 7186e22cefef..53e99fae95d4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java @@ -199,6 +199,25 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { assertEquals(freeformDisplay.mDisplayId, mResult.mPreferredDisplayId); } + @Test + public void testUsesNoDisplaySourceHandoverDisplayIdIfSet() { + final TestActivityDisplay freeformDisplay = createNewActivityDisplay( + WINDOWING_MODE_FREEFORM); + final TestActivityDisplay fullscreenDisplay = createNewActivityDisplay( + WINDOWING_MODE_FULLSCREEN); + + mCurrent.mPreferredDisplayId = fullscreenDisplay.mDisplayId; + ActivityRecord reusableActivity = createSourceActivity(fullscreenDisplay); + ActivityRecord source = createSourceActivity(freeformDisplay); + source.mHandoverLaunchDisplayId = freeformDisplay.mDisplayId; + source.noDisplay = true; + + assertEquals(RESULT_CONTINUE, mTarget.onCalculate(reusableActivity.getTaskRecord(), + null /* layout */, mActivity, source, null /* options */, mCurrent, mResult)); + + assertEquals(freeformDisplay.mDisplayId, mResult.mPreferredDisplayId); + } + // ===================================== // Launch Windowing Mode Related Tests // ===================================== @@ -768,6 +787,21 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { } @Test + public void testReturnBoundsForFullscreenWindowingMode() { + final TestActivityDisplay freeformDisplay = createNewActivityDisplay( + WINDOWING_MODE_FREEFORM); + + mCurrent.mPreferredDisplayId = freeformDisplay.mDisplayId; + mCurrent.mWindowingMode = WINDOWING_MODE_FULLSCREEN; + mCurrent.mBounds.set(0, 0, 200, 100); + + assertEquals(RESULT_CONTINUE, mTarget.onCalculate(/* task */ null, /* layout */ null, + mActivity, /* source */ null, /* options */ null, mCurrent, mResult)); + + assertEquals(new Rect(0, 0, 200, 100), mResult.mBounds); + } + + @Test public void testUsesDisplayOrientationForNoSensorOrientation() { final TestActivityDisplay freeformDisplay = createNewActivityDisplay( WINDOWING_MODE_FREEFORM); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java index 6b6b33c52d91..7da85af444d6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java @@ -34,6 +34,7 @@ import android.app.ActivityManager; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; import android.content.res.Configuration; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; @@ -180,6 +181,24 @@ public class TaskRecordTests extends ActivityTestsBase { mParentBounds); } + /** Ensures that the alias intent won't have target component resolved. */ + @Test + public void testTaskIntentActivityAlias() { + final String aliasActivity = DEFAULT_COMPONENT_PACKAGE_NAME + ".aliasActivity"; + final String targetActivity = DEFAULT_COMPONENT_PACKAGE_NAME + ".targetActivity"; + final Intent intent = new Intent(); + intent.setComponent(new ComponentName(DEFAULT_COMPONENT_PACKAGE_NAME, aliasActivity)); + final ActivityInfo info = new ActivityInfo(); + info.applicationInfo = new ApplicationInfo(); + info.packageName = DEFAULT_COMPONENT_PACKAGE_NAME; + info.targetActivity = targetActivity; + + final TaskRecord task = TaskRecord.create(mService, 1 /* taskId */, info, intent, + null /* taskDescription */); + assertEquals("The alias activity component should be saved in task intent.", aliasActivity, + task.intent.getComponent().getClassName()); + } + private void testStackBoundsConfiguration(int windowingMode, Rect parentBounds, Rect bounds, Rect expectedConfigBounds) { diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index 7f7803463543..c09cd46a6c04 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -19,6 +19,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.hardware.camera2.params.OutputConfiguration.ROTATION_90; +import static android.view.InsetsState.TYPE_TOP_BAR; import static android.view.Surface.ROTATION_0; import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; @@ -31,6 +32,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVE import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; +import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.never; @@ -56,6 +58,7 @@ import android.graphics.Rect; import android.platform.test.annotations.Presubmit; import android.util.Size; import android.view.DisplayCutout; +import android.view.InsetsSource; import android.view.SurfaceControl; import android.view.WindowManager; @@ -326,6 +329,20 @@ public class WindowStateTests extends WindowTestsBase { } @Test + public void testVisibleWithInsetsProvider() throws Exception { + final WindowState topBar = createWindow(null, TYPE_STATUS_BAR, "topBar"); + final WindowState app = createWindow(null, TYPE_APPLICATION, "app"); + topBar.mHasSurface = true; + assertTrue(topBar.isVisible()); + mDisplayContent.getInsetsStateController().getSourceProvider(TYPE_TOP_BAR) + .setWindow(topBar, null); + mDisplayContent.getInsetsStateController().onBarControllingWindowChanged(app); + mDisplayContent.getInsetsStateController().getSourceProvider(TYPE_TOP_BAR) + .onInsetsModified(app, new InsetsSource(TYPE_TOP_BAR)); + assertFalse(topBar.isVisible()); + } + + @Test public void testIsSelfOrAncestorWindowAnimating() { final WindowState root = createWindow(null, TYPE_APPLICATION, "root"); final WindowState child1 = createWindow(root, FIRST_SUB_WINDOW, "child1"); diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 294b7509698b..f1e22819f501 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -1744,8 +1744,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser mGadgetProxy.linkToDeath(new UsbGadgetDeathRecipient(), USB_GADGET_HAL_DEATH_COOKIE); mCurrentFunctions = UsbManager.FUNCTION_NONE; - mGadgetProxy.getCurrentUsbFunctions(new UsbGadgetCallback()); mCurrentUsbFunctionsRequested = true; + mGadgetProxy.getCurrentUsbFunctions(new UsbGadgetCallback()); } String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim(); updateState(state); diff --git a/startop/view_compiler/Android.bp b/startop/view_compiler/Android.bp index 91cec554d7cd..82056e9a33fe 100644 --- a/startop/view_compiler/Android.bp +++ b/startop/view_compiler/Android.bp @@ -34,6 +34,7 @@ cc_library_host_static { defaults: ["viewcompiler_defaults"], srcs: [ "dex_builder.cc", + "dex_layout_compiler.cc", "java_lang_builder.cc", "tinyxml_layout_parser.cc", "util.cc", diff --git a/startop/view_compiler/dex_builder_test/Android.bp b/startop/view_compiler/dex_builder_test/Android.bp index 4449ea0f707e..d4f38ed148c9 100644 --- a/startop/view_compiler/dex_builder_test/Android.bp +++ b/startop/view_compiler/dex_builder_test/Android.bp @@ -14,16 +14,30 @@ // limitations under the License. // +genrule { + name: "generate_compiled_layout", + tools: [":viewcompiler"], + cmd: "$(location :viewcompiler) $(in) --dex --out $(out) --package android.startop.test", + srcs: ["res/layout/layout1.xml"], + out: [ + "layout1.dex", + ], +} + android_test { name: "dex-builder-test", - srcs: ["src/android/startop/test/DexBuilderTest.java"], + srcs: [ + "src/android/startop/test/DexBuilderTest.java", + "src/android/startop/test/LayoutCompilerTest.java", + ], sdk_version: "current", - data: [":generate_dex_testcases"], + data: [":generate_dex_testcases", ":generate_compiled_layout"], static_libs: [ "android-support-test", "guava", ], manifest: "AndroidManifest.xml", + resource_dirs: ["res"], test_config: "AndroidTest.xml", test_suites: ["general-tests"], } diff --git a/startop/view_compiler/dex_builder_test/AndroidTest.xml b/startop/view_compiler/dex_builder_test/AndroidTest.xml index 6f90cf3b81a7..68d8fdc444d8 100644 --- a/startop/view_compiler/dex_builder_test/AndroidTest.xml +++ b/startop/view_compiler/dex_builder_test/AndroidTest.xml @@ -25,6 +25,7 @@ <option name="cleanup" value="true" /> <option name="push" value="trivial.dex->/data/local/tmp/dex-builder-test/trivial.dex" /> <option name="push" value="simple.dex->/data/local/tmp/dex-builder-test/simple.dex" /> + <option name="push" value="layout1.dex->/data/local/tmp/dex-builder-test/layout1.dex" /> </target_preparer> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > diff --git a/startop/view_compiler/dex_builder_test/res/layout/layout1.xml b/startop/view_compiler/dex_builder_test/res/layout/layout1.xml new file mode 100644 index 000000000000..0f9375c6ebce --- /dev/null +++ b/startop/view_compiler/dex_builder_test/res/layout/layout1.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical" + android:gravity="center"> + + <Button + android:layout_width="match_parent" + android:layout_height="match_parent"/> + <Button + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + </LinearLayout> diff --git a/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java b/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java new file mode 100644 index 000000000000..ce3ce8328559 --- /dev/null +++ b/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java @@ -0,0 +1,46 @@ +/* + * 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.startop.test; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.view.View; +import com.google.common.io.ByteStreams; +import dalvik.system.InMemoryDexClassLoader; +import dalvik.system.PathClassLoader; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.nio.ByteBuffer; +import org.junit.Assert; +import org.junit.Test; + +// Adding tests here requires changes in several other places. See README.md in +// the view_compiler directory for more information. +public class LayoutCompilerTest { + static ClassLoader loadDexFile(String filename) throws Exception { + return new PathClassLoader("/data/local/tmp/dex-builder-test/" + filename, + ClassLoader.getSystemClassLoader()); + } + + @Test + public void loadAndInflaterLayout1() throws Exception { + ClassLoader dex_file = loadDexFile("layout1.dex"); + Class compiled_view = dex_file.loadClass("android.startop.test.CompiledView"); + Method layout1 = compiled_view.getMethod("layout1", Context.class, int.class); + Context context = InstrumentationRegistry.getTargetContext(); + layout1.invoke(null, context, R.layout.layout1); + } +} diff --git a/startop/view_compiler/dex_layout_compiler.cc b/startop/view_compiler/dex_layout_compiler.cc new file mode 100644 index 000000000000..c68793d10399 --- /dev/null +++ b/startop/view_compiler/dex_layout_compiler.cc @@ -0,0 +1,226 @@ +/* + * 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. + */ + +#include "dex_layout_compiler.h" +#include "layout_validation.h" + +#include "android-base/stringprintf.h" + +namespace startop { + +using android::base::StringPrintf; + +void LayoutValidationVisitor::VisitStartTag(const std::u16string& name) { + if (0 == name.compare(u"merge")) { + message_ = "Merge tags are not supported"; + can_compile_ = false; + } + if (0 == name.compare(u"include")) { + message_ = "Include tags are not supported"; + can_compile_ = false; + } + if (0 == name.compare(u"view")) { + message_ = "View tags are not supported"; + can_compile_ = false; + } + if (0 == name.compare(u"fragment")) { + message_ = "Fragment tags are not supported"; + can_compile_ = false; + } +} + +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()})}, + 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")})}, + 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")})}, + 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_)); + + // Resources res = context.getResources(); + auto context_type = dex::TypeDescriptor::FromClassname("android.content.Context"); + auto resources_type = dex::TypeDescriptor::FromClassname("android.content.res.Resources"); + 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"), + "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_)); + + // xml.next(); // start document + method_->AddInstruction(dex::Instruction::InvokeInterface(xml_next_.id, {}, xml_)); +} + +void DexViewBuilder::Finish() {} + +namespace { +std::string ResolveName(const std::string& name) { + if (name == "View") return "android.view.View"; + if (name == "ViewGroup") return "android.view.ViewGroup"; + if (name.find(".") == std::string::npos) { + return StringPrintf("android.widget.%s", name.c_str()); + } + return name; +} +} // namespace + +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_)); + + dex::Value 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(); + method_->BuildConst4(null, 0); + method_->AddInstruction(dex::Instruction::InvokeVirtualObject( + try_create_view_.id, view, inflater_, null, classname_tmp_, context_, attrs_)); + ReleaseRegister(); + } else { + method_->AddInstruction(dex::Instruction::InvokeVirtualObject( + try_create_view_.id, view, inflater_, GetCurrentView(), classname_tmp_, context_, attrs_)); + } + auto label = method_->MakeLabel(); + // branch if not null + method_->AddInstruction( + dex::Instruction::OpWithArgs(dex::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")}, + context_, + attrs_); + + method_->AddInstruction( + dex::Instruction::OpWithArgs(dex::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))); + } + + if (!is_root_view) { + // layout_params = parent.generateLayoutParams(attrs); + dex::Value layout_params{AcquireRegister()}; + method_->AddInstruction(dex::Instruction::InvokeVirtualObject( + generate_layout_params_.id, layout_params, GetCurrentView(), attrs_)); + view_stack_.push_back({view, layout_params}); + } else { + view_stack_.push_back({view, {}}); + } +} + +void DexViewBuilder::FinishView() { + if (view_stack_.size() == 1) { + method_->BuildReturn(GetCurrentView(), /*is_object=*/true); + } else { + // parent.add(view, layout_params) + method_->AddInstruction(dex::Instruction::InvokeVirtual( + add_view_.id, /*dest=*/{}, GetParentView(), GetCurrentView(), GetCurrentLayoutParams())); + // xml.next(); // end tag + method_->AddInstruction(dex::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_--; } + +dex::Value DexViewBuilder::GetCurrentView() const { return view_stack_.back().view; } +dex::Value DexViewBuilder::GetCurrentLayoutParams() const { + return view_stack_.back().layout_params.value(); +} +dex::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(); +} + +} // namespace startop
\ No newline at end of file diff --git a/startop/view_compiler/dex_layout_compiler.h b/startop/view_compiler/dex_layout_compiler.h new file mode 100644 index 000000000000..170a1a610297 --- /dev/null +++ b/startop/view_compiler/dex_layout_compiler.h @@ -0,0 +1,118 @@ +/* + * 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. + */ + +#ifndef DEX_LAYOUT_COMPILER_H_ +#define DEX_LAYOUT_COMPILER_H_ + +#include "dex_builder.h" + +#include <codecvt> +#include <locale> +#include <string> +#include <vector> + +namespace startop { + +// This visitor does the actual view compilation, using a supplied builder. +template <typename Builder> +class LayoutCompilerVisitor { + public: + explicit LayoutCompilerVisitor(Builder* builder) : builder_{builder} {} + + void VisitStartDocument() { builder_->Start(); } + void VisitEndDocument() { builder_->Finish(); } + void VisitStartTag(const std::u16string& name) { + parent_stack_.push_back(ViewEntry{ + std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.to_bytes(name), {}}); + } + void VisitEndTag() { + auto entry = parent_stack_.back(); + parent_stack_.pop_back(); + + if (parent_stack_.empty()) { + GenerateCode(entry); + } else { + parent_stack_.back().children.push_back(entry); + } + } + + private: + struct ViewEntry { + std::string name; + std::vector<ViewEntry> children; + }; + + void GenerateCode(const ViewEntry& view) { + builder_->StartView(view.name, !view.children.empty()); + for (const auto& child : view.children) { + GenerateCode(child); + } + builder_->FinishView(); + } + + Builder* builder_; + + std::vector<ViewEntry> parent_stack_; +}; + +class DexViewBuilder { + public: + DexViewBuilder(dex::MethodBuilder* method); + + void Start(); + void Finish(); + void StartView(const std::string& name, bool is_viewgroup); + void FinishView(); + + private: + // Accessors for the stack of views that are under construction. + dex::Value AcquireRegister(); + void ReleaseRegister(); + dex::Value GetCurrentView() const; + dex::Value GetCurrentLayoutParams() const; + dex::Value GetParentView() const; + void PopViewStack(); + + dex::MethodBuilder* method_; + + // Registers used for code generation + 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_; + + 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; + }; + std::vector<ViewEntry> view_stack_; +}; + +} // namespace startop + +#endif // DEX_LAYOUT_COMPILER_H_ diff --git a/startop/view_compiler/java_lang_builder.cc b/startop/view_compiler/java_lang_builder.cc index 0b8754fc7096..920caeecf58e 100644 --- a/startop/view_compiler/java_lang_builder.cc +++ b/startop/view_compiler/java_lang_builder.cc @@ -67,7 +67,7 @@ void JavaLangViewBuilder::Finish() const { "}\n"; // end CompiledView } -void JavaLangViewBuilder::StartView(const string& class_name) { +void JavaLangViewBuilder::StartView(const string& class_name, bool /*is_viewgroup*/) { const string view_var = MakeVar("view"); const string layout_var = MakeVar("layout"); std::string parent = "null"; diff --git a/startop/view_compiler/java_lang_builder.h b/startop/view_compiler/java_lang_builder.h index c8d20b23cd13..69356d3a6594 100644 --- a/startop/view_compiler/java_lang_builder.h +++ b/startop/view_compiler/java_lang_builder.h @@ -35,7 +35,7 @@ class JavaLangViewBuilder { void Finish() const; // Begin creating a view (i.e. process the opening tag) - void StartView(const std::string& class_name); + void StartView(const std::string& class_name, bool is_viewgroup); // Finish a view, after all of its child nodes have been processed. void FinishView(); diff --git a/startop/view_compiler/main.cc b/startop/view_compiler/main.cc index 609bcf377b46..ae00187e1908 100644 --- a/startop/view_compiler/main.cc +++ b/startop/view_compiler/main.cc @@ -16,8 +16,11 @@ #include "gflags/gflags.h" +#include "android-base/stringprintf.h" #include "dex_builder.h" +#include "dex_layout_compiler.h" #include "java_lang_builder.h" +#include "layout_validation.h" #include "tinyxml_layout_parser.h" #include "util.h" @@ -32,6 +35,12 @@ namespace { using namespace tinyxml2; +using android::base::StringPrintf; +using startop::dex::ClassBuilder; +using startop::dex::DexBuilder; +using startop::dex::MethodBuilder; +using startop::dex::Prototype; +using startop::dex::TypeDescriptor; using namespace startop::util; using std::string; @@ -41,34 +50,44 @@ DEFINE_bool(dex, false, "Generate a DEX file instead of Java"); DEFINE_string(out, kStdoutFilename, "Where to write the generated class"); DEFINE_string(package, "", "The package name for the generated class (required)"); -class ViewCompilerXmlVisitor : public XMLVisitor { +template <typename Visitor> +class XmlVisitorAdapter : public XMLVisitor { public: - explicit ViewCompilerXmlVisitor(JavaLangViewBuilder* builder) : builder_(builder) {} + explicit XmlVisitorAdapter(Visitor* visitor) : visitor_{visitor} {} bool VisitEnter(const XMLDocument& /*doc*/) override { - builder_->Start(); + visitor_->VisitStartDocument(); return true; } bool VisitExit(const XMLDocument& /*doc*/) override { - builder_->Finish(); + visitor_->VisitEndDocument(); return true; } bool VisitEnter(const XMLElement& element, const XMLAttribute* /*firstAttribute*/) override { - builder_->StartView(element.Name()); + visitor_->VisitStartTag( + std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes( + element.Name())); return true; } bool VisitExit(const XMLElement& /*element*/) override { - builder_->FinishView(); + visitor_->VisitEndTag(); return true; } private: - JavaLangViewBuilder* builder_; + Visitor* visitor_; }; +template <typename Builder> +void CompileLayout(XMLDocument* xml, Builder* builder) { + startop::LayoutCompilerVisitor visitor{builder}; + XmlVisitorAdapter<decltype(visitor)> adapter{&visitor}; + xml->Accept(&adapter); +} + } // end namespace int main(int argc, char** argv) { @@ -88,16 +107,8 @@ int main(int argc, char** argv) { return 1; } - if (FLAGS_dex) { - startop::dex::WriteTestDexFile("test.dex"); - return 0; - } - const char* const filename = argv[kFileNameParam]; - const string layout_name = FindLayoutNameFromFilename(filename); - - // We want to generate Java language code to inflate exactly this layout. This means - // generating code to walk the resource XML too. + const string layout_name = startop::util::FindLayoutNameFromFilename(filename); XMLDocument xml; xml.LoadFile(filename); @@ -108,15 +119,34 @@ int main(int argc, char** argv) { return 1; } + const bool is_stdout = FLAGS_out == kStdoutFilename; + std::ofstream outfile; - if (FLAGS_out != kStdoutFilename) { + if (!is_stdout) { outfile.open(FLAGS_out); } - JavaLangViewBuilder builder{ - FLAGS_package, layout_name, FLAGS_out == kStdoutFilename ? std::cout : outfile}; - - ViewCompilerXmlVisitor visitor{&builder}; - xml.Accept(&visitor); + if (FLAGS_dex) { + DexBuilder dex_file; + string class_name = StringPrintf("%s.CompiledView", FLAGS_package.c_str()); + ClassBuilder compiled_view{dex_file.MakeClass(class_name)}; + MethodBuilder method{compiled_view.CreateMethod( + layout_name, + Prototype{TypeDescriptor::FromClassname("android.view.View"), + TypeDescriptor::FromClassname("android.content.Context"), + TypeDescriptor::Int()})}; + startop::DexViewBuilder builder{&method}; + CompileLayout(&xml, &builder); + method.Encode(); + + slicer::MemView image{dex_file.CreateImage()}; + + (is_stdout ? std::cout : outfile).write(image.ptr<const char>(), image.size()); + } else { + // Generate Java language output. + JavaLangViewBuilder builder{FLAGS_package, layout_name, is_stdout ? std::cout : outfile}; + + CompileLayout(&xml, &builder); + } return 0; } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index a9a128bf6681..312b31899ad6 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2231,7 +2231,7 @@ public class CarrierConfigManager { * e.g.) To use RSCP by default, set the value to "rscp". The signal strength level will * then be determined by #KEY_WCDMA_RSCP_THRESHOLDS_INT_ARRAY * <p> - * Currently this only supports the value "rscp" + * Currently this supports the value "rscp" and "rssi". * @hide */ // FIXME: this key and related keys must not be exposed without a consistent philosophy for @@ -2875,7 +2875,7 @@ public class CarrierConfigManager { -95, /* SIGNAL_STRENGTH_GOOD */ -85 /* SIGNAL_STRENGTH_GREAT */ }); - sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, ""); + sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, "rssi"); sDefaults.putBoolean(KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL, false); sDefaults.putBoolean(KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL, false); sDefaults.putBoolean(KEY_CALL_FORWARDING_OVER_UT_WARNING_BOOL, false); diff --git a/telephony/java/android/telephony/CellSignalStrength.java b/telephony/java/android/telephony/CellSignalStrength.java index f2c14a147230..e6182eda852a 100644 --- a/telephony/java/android/telephony/CellSignalStrength.java +++ b/telephony/java/android/telephony/CellSignalStrength.java @@ -42,6 +42,9 @@ public abstract class CellSignalStrength { public static final int NUM_SIGNAL_STRENGTH_BINS = 5; /** @hide */ + protected static final int NUM_SIGNAL_STRENGTH_THRESHOLDS = NUM_SIGNAL_STRENGTH_BINS - 1; + + /** @hide */ public static final String[] SIGNAL_STRENGTH_NAMES = { "none", "poor", "moderate", "good", "great" }; diff --git a/telephony/java/android/telephony/CellSignalStrengthWcdma.java b/telephony/java/android/telephony/CellSignalStrengthWcdma.java index 88f6fbc4464d..0760407171ae 100644 --- a/telephony/java/android/telephony/CellSignalStrengthWcdma.java +++ b/telephony/java/android/telephony/CellSignalStrengthWcdma.java @@ -21,6 +21,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; import android.telephony.Rlog; +import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -41,8 +42,18 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements private static final int WCDMA_RSSI_POOR = -107; private static final int WCDMA_RSSI_MIN = -113; - private static final int WCDMA_RSCP_MIN = -120; + private static final int[] sRssiThresholds = new int[]{ + WCDMA_RSSI_POOR, WCDMA_RSSI_MODERATE, WCDMA_RSSI_GOOD, WCDMA_RSSI_GREAT}; + private static final int WCDMA_RSCP_MAX = -24; + private static final int WCDMA_RSCP_GREAT = -85; + private static final int WCDMA_RSCP_GOOD = -95; + private static final int WCDMA_RSCP_MODERATE = -105; + private static final int WCDMA_RSCP_POOR = -115; + private static final int WCDMA_RSCP_MIN = -120; + + private static final int[] sRscpThresholds = new int[] { + WCDMA_RSCP_POOR, WCDMA_RSCP_MODERATE, WCDMA_RSCP_GOOD, WCDMA_RSCP_GREAT}; // TODO: Because these are used as values in CarrierConfig, they should be exposed somehow. /** @hide */ @@ -54,6 +65,9 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements /** @hide */ public static final String LEVEL_CALCULATION_METHOD_RSCP = "rscp"; + // Default to RSSI for backwards compatibility with older devices + private static final String sLevelCalculationMethod = LEVEL_CALCULATION_METHOD_RSSI; + private int mRssi; // in dBm [-113, 51] or CellInfo.UNAVAILABLE if unknown private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5 or // CellInfo.UNAVAILABLE if unknown @@ -121,10 +135,6 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN; } - private static final String sLevelCalculationMethod = LEVEL_CALCULATION_METHOD_RSSI; - private static final int[] sThresholds = new int[]{ - WCDMA_RSSI_POOR, WCDMA_RSSI_GOOD, WCDMA_RSSI_GOOD, WCDMA_RSSI_GREAT}; - /** * Retrieve an abstract level value for the overall signal strength. * @@ -140,41 +150,46 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements @Override public void updateLevel(PersistableBundle cc, ServiceState ss) { String calcMethod; - int[] thresholds; + int[] rscpThresholds; if (cc == null) { calcMethod = sLevelCalculationMethod; - thresholds = sThresholds; + rscpThresholds = sRscpThresholds; } else { // TODO: abstract this entire thing into a series of functions calcMethod = cc.getString( CarrierConfigManager.KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, sLevelCalculationMethod); - thresholds = cc.getIntArray( + if (TextUtils.isEmpty(calcMethod)) calcMethod = sLevelCalculationMethod; + rscpThresholds = cc.getIntArray( CarrierConfigManager.KEY_WCDMA_RSCP_THRESHOLDS_INT_ARRAY); - if (thresholds == null) thresholds = sThresholds; + if (rscpThresholds == null || rscpThresholds.length != NUM_SIGNAL_STRENGTH_THRESHOLDS) { + rscpThresholds = sRscpThresholds; + } } - int level = thresholds.length; + int level = NUM_SIGNAL_STRENGTH_THRESHOLDS; switch (calcMethod) { case LEVEL_CALCULATION_METHOD_RSCP: if (mRscp < WCDMA_RSCP_MIN || mRscp > WCDMA_RSCP_MAX) { mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN; return; } - while (level > 0 && mRscp < thresholds[level - 1]) level--; + while (level > 0 && mRscp < rscpThresholds[level - 1]) level--; mLevel = level; return; + default: + loge("Invalid Level Calculation Method for CellSignalStrengthWcdma = " + + calcMethod); + /** fall through */ case LEVEL_CALCULATION_METHOD_RSSI: if (mRssi < WCDMA_RSSI_MIN || mRssi > WCDMA_RSSI_MAX) { mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN; return; } - while (level > 0 && mRssi < thresholds[level - 1]) level--; + while (level > 0 && mRssi < sRssiThresholds[level - 1]) level--; mLevel = level; return; - default: - mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN; } } @@ -204,7 +219,7 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements } /** - * Get the signal strength as dBm + * Get the RSSI as dBm * * @hide */ @@ -214,12 +229,32 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements /** * Get the RSCP as dBm + * * @hide */ public int getRscp() { return mRscp; } + /** + * Get the Ec/No as dB + * + * @hide + */ + public int getEcNo() { + return mEcNo; + } + + /** + * Return the Bit Error Rate + * + * @returns the bit error rate (0-7, 99) as defined in TS 27.007 8.5 or UNAVAILABLE. + * @hide + */ + public int getBitErrorRate() { + return mBitErrorRate; + } + @Override public int hashCode() { return Objects.hash(mRssi, mBitErrorRate, mRscp, mEcNo, mLevel); @@ -304,9 +339,16 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements }; /** - * log + * log warning */ private static void log(String s) { Rlog.w(LOG_TAG, s); } + + /** + * log error + */ + private static void loge(String s) { + Rlog.e(LOG_TAG, s); + } } diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index b258f52d58ec..83738997a067 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -17,10 +17,11 @@ package android.telephony; import android.annotation.UnsupportedAppUsage; +import android.net.LinkProperties; import android.os.Parcel; import android.os.Parcelable; -import android.telephony.TelephonyManager; -import android.net.LinkProperties; + +import java.util.Objects; /** * Contains precise data connection state. @@ -32,7 +33,6 @@ import android.net.LinkProperties; * <li>Network type of the connection. * <li>APN type. * <li>APN. - * <li>Data connection change reason. * <li>The properties of the network link. * <li>Data connection fail cause. * </ul> @@ -45,7 +45,6 @@ public class PreciseDataConnectionState implements Parcelable { private int mNetworkType = TelephonyManager.NETWORK_TYPE_UNKNOWN; private String mAPNType = ""; private String mAPN = ""; - private String mReason = ""; private LinkProperties mLinkProperties = null; private String mFailCause = ""; @@ -55,14 +54,12 @@ public class PreciseDataConnectionState implements Parcelable { * @hide */ @UnsupportedAppUsage - public PreciseDataConnectionState(int state, int networkType, - String apnType, String apn, String reason, - LinkProperties linkProperties, String failCause) { + public PreciseDataConnectionState(int state, int networkType, String apnType, String apn, + LinkProperties linkProperties, String failCause) { mState = state; mNetworkType = networkType; mAPNType = apnType; mAPN = apn; - mReason = reason; mLinkProperties = linkProperties; mFailCause = failCause; } @@ -83,7 +80,6 @@ public class PreciseDataConnectionState implements Parcelable { mNetworkType = in.readInt(); mAPNType = in.readString(); mAPN = in.readString(); - mReason = in.readString(); mLinkProperties = (LinkProperties)in.readParcelable(null); mFailCause = in.readString(); } @@ -144,14 +140,6 @@ public class PreciseDataConnectionState implements Parcelable { } /** - * Get data connection change reason. - */ - @UnsupportedAppUsage - public String getDataConnectionChangeReason() { - return mReason; - } - - /** * Get the properties of the network link. */ @UnsupportedAppUsage @@ -178,7 +166,6 @@ public class PreciseDataConnectionState implements Parcelable { out.writeInt(mNetworkType); out.writeString(mAPNType); out.writeString(mAPN); - out.writeString(mReason); out.writeParcelable(mLinkProperties, flags); out.writeString(mFailCause); } @@ -197,16 +184,7 @@ public class PreciseDataConnectionState implements Parcelable { @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + mState; - result = prime * result + mNetworkType; - result = prime * result + ((mAPNType == null) ? 0 : mAPNType.hashCode()); - result = prime * result + ((mAPN == null) ? 0 : mAPN.hashCode()); - result = prime * result + ((mReason == null) ? 0 : mReason.hashCode()); - result = prime * result + ((mLinkProperties == null) ? 0 : mLinkProperties.hashCode()); - result = prime * result + ((mFailCause == null) ? 0 : mFailCause.hashCode()); - return result; + return Objects.hash(mState, mNetworkType, mAPNType, mAPN, mLinkProperties, mFailCause); } @Override @@ -252,13 +230,6 @@ public class PreciseDataConnectionState implements Parcelable { if (mNetworkType != other.mNetworkType) { return false; } - if (mReason == null) { - if (other.mReason != null) { - return false; - } - } else if (!mReason.equals(other.mReason)) { - return false; - } if (mState != other.mState) { return false; } @@ -273,7 +244,6 @@ public class PreciseDataConnectionState implements Parcelable { sb.append(", Network type: " + mNetworkType); sb.append(", APN type: " + mAPNType); sb.append(", APN: " + mAPN); - sb.append(", Change reason: " + mReason); sb.append(", Link properties: " + mLinkProperties); sb.append(", Fail cause: " + mFailCause); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 4598afaa41ce..8dfdb2f4a334 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -772,7 +772,6 @@ public class TelephonyManager { * The {@link #EXTRA_DATA_NETWORK_TYPE} extra indicates the connection network type. * The {@link #EXTRA_DATA_APN_TYPE} extra indicates the APN type. * The {@link #EXTRA_DATA_APN} extra indicates the APN. - * The {@link #EXTRA_DATA_CHANGE_REASON} extra indicates the connection change reason. * The {@link #EXTRA_DATA_IFACE_PROPERTIES} extra indicates the connection interface. * The {@link #EXTRA_DATA_FAILURE_CAUSE} extra indicates the connection fail cause. * @@ -783,7 +782,6 @@ public class TelephonyManager { * @see #EXTRA_DATA_NETWORK_TYPE * @see #EXTRA_DATA_APN_TYPE * @see #EXTRA_DATA_APN - * @see #EXTRA_DATA_CHANGE_REASON * @see #EXTRA_DATA_IFACE * @see #EXTRA_DATA_FAILURE_CAUSE * @hide @@ -873,18 +871,6 @@ public class TelephonyManager { /** * The lookup key used with the {@link #ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED} broadcast - * for an String representation of the change reason. - * - * <p class="note"> - * Retrieve with - * {@link android.content.Intent#getStringExtra(String name)}. - * - * @hide - */ - public static final String EXTRA_DATA_CHANGE_REASON = PhoneConstants.STATE_CHANGE_REASON_KEY; - - /** - * The lookup key used with the {@link #ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED} broadcast * for an String representation of the data interface. * * <p class="note"> diff --git a/media/java/android/media/session/ControllerCallbackLink.aidl b/telephony/java/android/telephony/ims/Rcs1To1Thread.aidl index 788f5d35d72b..9fdc41d2bd5f 100644 --- a/media/java/android/media/session/ControllerCallbackLink.aidl +++ b/telephony/java/android/telephony/ims/Rcs1To1Thread.aidl @@ -1,11 +1,12 @@ /* - * Copyright 2018 The Android Open Source Project + * + * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.media.session; -parcelable ControllerCallbackLink; +package android.telephony.ims; + +parcelable Rcs1To1Thread; diff --git a/telephony/java/android/telephony/ims/Rcs1To1Thread.java b/telephony/java/android/telephony/ims/Rcs1To1Thread.java new file mode 100644 index 000000000000..709b3aa0f804 --- /dev/null +++ b/telephony/java/android/telephony/ims/Rcs1To1Thread.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * Rcs1To1Thread represents a single RCS conversation thread with a total of two + * {@link RcsParticipant}s. + * @hide - TODO(sahinc) make this public + */ +public class Rcs1To1Thread extends RcsThread { + public Rcs1To1Thread(int threadId) { + super(threadId); + } + + public static final Creator<Rcs1To1Thread> CREATOR = new Creator<Rcs1To1Thread>() { + @Override + public Rcs1To1Thread createFromParcel(Parcel in) { + return new Rcs1To1Thread(in); + } + + @Override + public Rcs1To1Thread[] newArray(int size) { + return new Rcs1To1Thread[size]; + } + }; + + protected Rcs1To1Thread(Parcel in) { + super(in); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(RCS_1_TO_1_TYPE); + super.writeToParcel(dest, flags); + } +} diff --git a/core/java/android/hardware/display/BrightnessCorrection.aidl b/telephony/java/android/telephony/ims/RcsFileTransferPart.aidl index 3abe29cc0076..eaf312877deb 100644 --- a/core/java/android/hardware/display/BrightnessCorrection.aidl +++ b/telephony/java/android/telephony/ims/RcsFileTransferPart.aidl @@ -1,11 +1,12 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * + * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +15,6 @@ * limitations under the License. */ -package android.hardware.display; +package android.telephony.ims; -parcelable BrightnessCorrection; +parcelable RcsFileTransferPart; diff --git a/telephony/java/android/telephony/ims/RcsFileTransferPart.java b/telephony/java/android/telephony/ims/RcsFileTransferPart.java new file mode 100644 index 000000000000..39c58dd9c15b --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsFileTransferPart.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * A part of a composite {@link RcsMessage} that holds a file transfer. + * @hide - TODO(sahinc) make this public + */ +public class RcsFileTransferPart extends RcsPart { + public static final Creator<RcsFileTransferPart> CREATOR = new Creator<RcsFileTransferPart>() { + @Override + public RcsFileTransferPart createFromParcel(Parcel in) { + return new RcsFileTransferPart(in); + } + + @Override + public RcsFileTransferPart[] newArray(int size) { + return new RcsFileTransferPart[size]; + } + }; + + protected RcsFileTransferPart(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsGroupThread.aidl b/telephony/java/android/telephony/ims/RcsGroupThread.aidl new file mode 100644 index 000000000000..c4ce5299e512 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsGroupThread.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsGroupThread; diff --git a/telephony/java/android/telephony/ims/RcsGroupThread.java b/telephony/java/android/telephony/ims/RcsGroupThread.java new file mode 100644 index 000000000000..d954b2d70ac3 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsGroupThread.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * RcsGroupThread represents a single RCS conversation thread where {@link RcsParticipant}s can join + * or leave. + * @hide - TODO(sahinc) make this public + */ +public class RcsGroupThread extends RcsThread { + public static final Creator<RcsGroupThread> CREATOR = new Creator<RcsGroupThread>() { + @Override + public RcsGroupThread createFromParcel(Parcel in) { + return new RcsGroupThread(in); + } + + @Override + public RcsGroupThread[] newArray(int size) { + return new RcsGroupThread[size]; + } + }; + + protected RcsGroupThread(Parcel in) { + super(in); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(RCS_GROUP_TYPE); + super.writeToParcel(dest, flags); + } +} diff --git a/telephony/java/android/telephony/ims/RcsIncomingMessage.aidl b/telephony/java/android/telephony/ims/RcsIncomingMessage.aidl new file mode 100644 index 000000000000..6552a82c9072 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsIncomingMessage.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsIncomingMessage; diff --git a/telephony/java/android/telephony/ims/RcsIncomingMessage.java b/telephony/java/android/telephony/ims/RcsIncomingMessage.java new file mode 100644 index 000000000000..f39e06db068a --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsIncomingMessage.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * This is a single instance of a message received over RCS. + * @hide - TODO(sahinc) make this public + */ +public class RcsIncomingMessage extends RcsMessage { + public static final Creator<RcsIncomingMessage> CREATOR = new Creator<RcsIncomingMessage>() { + @Override + public RcsIncomingMessage createFromParcel(Parcel in) { + return new RcsIncomingMessage(in); + } + + @Override + public RcsIncomingMessage[] newArray(int size) { + return new RcsIncomingMessage[size]; + } + }; + + protected RcsIncomingMessage(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsLocationPart.aidl b/telephony/java/android/telephony/ims/RcsLocationPart.aidl new file mode 100644 index 000000000000..4fe5ca97a30d --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsLocationPart.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsLocationPart; diff --git a/telephony/java/android/telephony/ims/RcsLocationPart.java b/telephony/java/android/telephony/ims/RcsLocationPart.java new file mode 100644 index 000000000000..19be4ceaf688 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsLocationPart.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * A part of a composite {@link RcsMessage} that holds a location + * @hide - TODO(sahinc) make this public + */ +public class RcsLocationPart extends RcsPart { + public static final Creator<RcsLocationPart> CREATOR = new Creator<RcsLocationPart>() { + @Override + public RcsLocationPart createFromParcel(Parcel in) { + return new RcsLocationPart(in); + } + + @Override + public RcsLocationPart[] newArray(int size) { + return new RcsLocationPart[size]; + } + }; + + protected RcsLocationPart(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsManager.aidl b/telephony/java/android/telephony/ims/RcsManager.aidl new file mode 100644 index 000000000000..63bc71c5ee46 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsManager.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsManager; diff --git a/telephony/java/android/telephony/ims/RcsManager.java b/telephony/java/android/telephony/ims/RcsManager.java index d50b516b8754..df108c88e3b0 100644 --- a/telephony/java/android/telephony/ims/RcsManager.java +++ b/telephony/java/android/telephony/ims/RcsManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2019 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/telephony/java/android/telephony/ims/RcsMessage.aidl b/telephony/java/android/telephony/ims/RcsMessage.aidl new file mode 100644 index 000000000000..b32cd1208c40 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsMessage.aidl @@ -0,0 +1,20 @@ +/* + * + * 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.telephony.ims; + +parcelable RcsMessage; diff --git a/telephony/java/android/telephony/ims/RcsMessage.java b/telephony/java/android/telephony/ims/RcsMessage.java new file mode 100644 index 000000000000..d46685c4a572 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsMessage.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcelable; + +/** + * This is a single instance of a message sent or received over RCS. + * @hide - TODO(sahinc) make this public + */ +public abstract class RcsMessage implements Parcelable { +} diff --git a/telephony/java/android/telephony/ims/RcsMessageStore.java b/telephony/java/android/telephony/ims/RcsMessageStore.java index c89c0bebb1a1..1bf6ffd81ca0 100644 --- a/telephony/java/android/telephony/ims/RcsMessageStore.java +++ b/telephony/java/android/telephony/ims/RcsMessageStore.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2019 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package android.telephony.ims; +import android.annotation.Nullable; +import android.annotation.WorkerThread; import android.os.RemoteException; import android.os.ServiceManager; import android.telephony.Rlog; @@ -27,26 +29,93 @@ import android.telephony.ims.aidl.IRcs; * @hide - TODO make this public */ public class RcsMessageStore { - private static final String TAG = "RcsMessageStore"; - private static final boolean VDBG = false; + static final String TAG = "RcsMessageStore"; /** - * Delete the RcsThread identified by the given threadId. + * Returns the first chunk of existing {@link RcsThread}s in the common storage. + * @param queryParameters Parameters to specify to return a subset of all RcsThreads. + * Passing a value of null will return all threads. + */ + @WorkerThread + public RcsThreadQueryResult getRcsThreads(@Nullable RcsThreadQueryParameters queryParameters) { + try { + IRcs iRcs = IRcs.Stub.asInterface(ServiceManager.getService("ircs")); + if (iRcs != null) { + return iRcs.getRcsThreads(queryParameters); + } + } catch (RemoteException re) { + Rlog.e(TAG, "RcsMessageStore: Exception happened during getRcsThreads", re); + } + + return null; + } + + /** + * Returns the next chunk of {@link RcsThread}s in the common storage. + * @param continuationToken A token to continue the query to get the next chunk. This is + * obtained through {@link RcsThreadQueryResult#nextChunkToken}. + */ + @WorkerThread + public RcsThreadQueryResult getRcsThreads(RcsThreadQueryContinuationToken continuationToken) { + try { + IRcs iRcs = IRcs.Stub.asInterface(ServiceManager.getService("ircs")); + if (iRcs != null) { + return iRcs.getRcsThreadsWithToken(continuationToken); + } + } catch (RemoteException re) { + Rlog.e(TAG, "RcsMessageStore: Exception happened during getRcsThreads", re); + } + + return null; + } + + /** + * Creates a new 1 to 1 thread with the given participant and persists it in the storage. + */ + @WorkerThread + public Rcs1To1Thread createRcs1To1Thread(RcsParticipant recipient) { + try { + IRcs iRcs = IRcs.Stub.asInterface(ServiceManager.getService("ircs")); + if (iRcs != null) { + return iRcs.createRcs1To1Thread(recipient); + } + } catch (RemoteException re) { + Rlog.e(TAG, "RcsMessageStore: Exception happened during createRcs1To1Thread", re); + } + + return null; + } + + /** + * Delete the {@link RcsThread} identified by the given threadId. * @param threadId threadId of the thread to be deleted. */ + @WorkerThread public void deleteThread(int threadId) { - if (VDBG) logd("deleteThread: threadId: " + threadId); try { IRcs iRcs = IRcs.Stub.asInterface(ServiceManager.getService("ircs")); if (iRcs != null) { iRcs.deleteThread(threadId); } } catch (RemoteException re) { - + Rlog.e(TAG, "RcsMessageStore: Exception happened during deleteThread", re); } } - private static void logd(String msg) { - Rlog.d(TAG, msg); + /** + * Creates a new participant and persists it in the storage. + * @param canonicalAddress The defining address (e.g. phone number) of the participant. + */ + public RcsParticipant createRcsParticipant(String canonicalAddress) { + try { + IRcs iRcs = IRcs.Stub.asInterface(ServiceManager.getService("ircs")); + if (iRcs != null) { + return iRcs.createRcsParticipant(canonicalAddress); + } + } catch (RemoteException re) { + Rlog.e(TAG, "RcsMessageStore: Exception happened during createRcsParticipant", re); + } + + return null; } } diff --git a/telephony/java/android/telephony/ims/RcsMultiMediaPart.java b/telephony/java/android/telephony/ims/RcsMultiMediaPart.java new file mode 100644 index 000000000000..d295fba365f0 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsMultiMediaPart.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * A part of a composite {@link RcsMessage} that holds a media that is rendered on the screen + * (i.e. image, video etc) + * @hide - TODO(sahinc) make this public + */ +public class RcsMultiMediaPart extends RcsFileTransferPart { + public static final Creator<RcsMultiMediaPart> CREATOR = new Creator<RcsMultiMediaPart>() { + @Override + public RcsMultiMediaPart createFromParcel(Parcel in) { + return new RcsMultiMediaPart(in); + } + + @Override + public RcsMultiMediaPart[] newArray(int size) { + return new RcsMultiMediaPart[size]; + } + }; + + protected RcsMultiMediaPart(Parcel in) { + super(in); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsMultimediaPart.aidl b/telephony/java/android/telephony/ims/RcsMultimediaPart.aidl new file mode 100644 index 000000000000..5992d95c3b9c --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsMultimediaPart.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsMultimediaPart; diff --git a/telephony/java/android/telephony/ims/RcsOutgoingMessage.aidl b/telephony/java/android/telephony/ims/RcsOutgoingMessage.aidl new file mode 100644 index 000000000000..6e0c80f3af81 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsOutgoingMessage.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsOutgoingMessage; diff --git a/telephony/java/android/telephony/ims/RcsOutgoingMessage.java b/telephony/java/android/telephony/ims/RcsOutgoingMessage.java new file mode 100644 index 000000000000..bfb161133618 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsOutgoingMessage.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * This is a single instance of a message sent over RCS. + * @hide - TODO(sahinc) make this public + */ +public class RcsOutgoingMessage extends RcsMessage { + public static final Creator<RcsOutgoingMessage> CREATOR = new Creator<RcsOutgoingMessage>() { + @Override + public RcsOutgoingMessage createFromParcel(Parcel in) { + return new RcsOutgoingMessage(in); + } + + @Override + public RcsOutgoingMessage[] newArray(int size) { + return new RcsOutgoingMessage[size]; + } + }; + + protected RcsOutgoingMessage(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsPart.aidl b/telephony/java/android/telephony/ims/RcsPart.aidl new file mode 100644 index 000000000000..8b8077d57676 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsPart.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsPart; diff --git a/telephony/java/android/telephony/ims/RcsPart.java b/telephony/java/android/telephony/ims/RcsPart.java new file mode 100644 index 000000000000..da501738a0bf --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsPart.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcelable; + +/** + * A part of a composite {@link RcsMessage}. + * @hide - TODO(sahinc) make this public + */ +public abstract class RcsPart implements Parcelable { +} diff --git a/telephony/java/android/telephony/ims/RcsParticipant.aidl b/telephony/java/android/telephony/ims/RcsParticipant.aidl new file mode 100644 index 000000000000..1c4436367e54 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsParticipant.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsParticipant; diff --git a/telephony/java/android/telephony/ims/RcsParticipant.java b/telephony/java/android/telephony/ims/RcsParticipant.java new file mode 100644 index 000000000000..70500aaa2e8b --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsParticipant.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * RcsParticipant is an RCS capable contact that can participate in {@link RcsThread}s. + * @hide - TODO(sahinc) make this public + */ +public class RcsParticipant implements Parcelable { + /** + * Returns the row id of this participant. + * + * TODO(sahinc) implement + * @hide + */ + public int getId() { + return 12345; + } + + public static final Creator<RcsParticipant> CREATOR = new Creator<RcsParticipant>() { + @Override + public RcsParticipant createFromParcel(Parcel in) { + return new RcsParticipant(in); + } + + @Override + public RcsParticipant[] newArray(int size) { + return new RcsParticipant[size]; + } + }; + + protected RcsParticipant(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + + } +} diff --git a/telephony/java/android/telephony/ims/RcsParticipantAliasChangedEvent.aidl b/telephony/java/android/telephony/ims/RcsParticipantAliasChangedEvent.aidl new file mode 100644 index 000000000000..b9d819054527 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsParticipantAliasChangedEvent.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsParticipantAliasChangedEvent; diff --git a/telephony/java/android/telephony/ims/RcsParticipantAliasChangedEvent.java b/telephony/java/android/telephony/ims/RcsParticipantAliasChangedEvent.java new file mode 100644 index 000000000000..b9ca5a86f84d --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsParticipantAliasChangedEvent.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * An event that indicates an {@link RcsParticipant}'s alias was changed. + * @hide - TODO(sahinc) make this public + */ +public class RcsParticipantAliasChangedEvent extends RcsParticipantEvent { + public static final Creator<RcsParticipantAliasChangedEvent> CREATOR = + new Creator<RcsParticipantAliasChangedEvent>() { + @Override + public RcsParticipantAliasChangedEvent createFromParcel(Parcel in) { + return new RcsParticipantAliasChangedEvent(in); + } + + @Override + public RcsParticipantAliasChangedEvent[] newArray(int size) { + return new RcsParticipantAliasChangedEvent[size]; + } + }; + + protected RcsParticipantAliasChangedEvent(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsParticipantEvent.aidl b/telephony/java/android/telephony/ims/RcsParticipantEvent.aidl new file mode 100644 index 000000000000..c0a77897abd5 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsParticipantEvent.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsParticipantEvent; diff --git a/telephony/java/android/telephony/ims/RcsParticipantEvent.java b/telephony/java/android/telephony/ims/RcsParticipantEvent.java new file mode 100644 index 000000000000..371b8b723d0a --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsParticipantEvent.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcelable; + +/** + * An event that is associated with an {@link RcsParticipant} + * @hide - TODO(sahinc) make this public + */ +public abstract class RcsParticipantEvent implements Parcelable { +} diff --git a/telephony/java/android/telephony/ims/RcsTextPart.aidl b/telephony/java/android/telephony/ims/RcsTextPart.aidl new file mode 100644 index 000000000000..4f9fe1fe26fe --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsTextPart.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsTextPart; diff --git a/telephony/java/android/telephony/ims/RcsTextPart.java b/telephony/java/android/telephony/ims/RcsTextPart.java new file mode 100644 index 000000000000..2a72df17f32a --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsTextPart.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * A part of a composite {@link RcsMessage} that holds a string + * @hide - TODO(sahinc) make this public + */ +public class RcsTextPart extends RcsPart { + public static final Creator<RcsTextPart> CREATOR = new Creator<RcsTextPart>() { + @Override + public RcsTextPart createFromParcel(Parcel in) { + return new RcsTextPart(in); + } + + @Override + public RcsTextPart[] newArray(int size) { + return new RcsTextPart[size]; + } + }; + + protected RcsTextPart(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsThread.aidl b/telephony/java/android/telephony/ims/RcsThread.aidl index 79d473266272..d9cf6dbc0ff0 100644 --- a/telephony/java/android/telephony/ims/RcsThread.aidl +++ b/telephony/java/android/telephony/ims/RcsThread.aidl @@ -1,6 +1,6 @@ /* * - * Copyright 2018, The Android Open Source Project + * 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. diff --git a/telephony/java/android/telephony/ims/RcsThread.java b/telephony/java/android/telephony/ims/RcsThread.java index b7f440d94583..c0a0d946d204 100644 --- a/telephony/java/android/telephony/ims/RcsThread.java +++ b/telephony/java/android/telephony/ims/RcsThread.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2019 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,51 +18,51 @@ package android.telephony.ims; import android.os.Parcel; import android.os.Parcelable; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.telephony.ims.aidl.IRcs; +import android.util.Log; /** * RcsThread represents a single RCS conversation thread. It holds messages that were sent and - * received and events that occured on that thread. + * received and events that occurred on that thread. * @hide - TODO(sahinc) make this public */ -public class RcsThread implements Parcelable { +public abstract class RcsThread implements Parcelable { + // Since this is an abstract class that gets parcelled, the sub-classes need to write these + // magic values into the parcel so that we know which type to unparcel into. + protected static final int RCS_1_TO_1_TYPE = 998; + protected static final int RCS_GROUP_TYPE = 999; + + protected int mThreadId; + + protected RcsThread(int threadId) { + mThreadId = threadId; + } + + protected RcsThread(Parcel in) { + mThreadId = in.readInt(); + } + public static final Creator<RcsThread> CREATOR = new Creator<RcsThread>() { @Override public RcsThread createFromParcel(Parcel in) { - return new RcsThread(in); + int type = in.readInt(); + + switch (type) { + case RCS_1_TO_1_TYPE: + return new Rcs1To1Thread(in); + case RCS_GROUP_TYPE: + return new RcsGroupThread(in); + default: + Log.e(RcsMessageStore.TAG, "Cannot unparcel RcsThread, wrong type: " + type); + } + return null; } @Override public RcsThread[] newArray(int size) { - return new RcsThread[size]; + return new RcsThread[0]; } }; - protected RcsThread(Parcel in) { - } - - /** - * Returns the number of messages in this RCS thread. - * - * @hide - */ - public int getMessageCount() { - try { - IRcs iRcs = IRcs.Stub.asInterface(ServiceManager.getService("ircs")); - if (iRcs != null) { - // TODO(sahinc): substitute to the regular thread id once we have database - // TODO(sahinc): connection in place - return iRcs.getMessageCount(/* rcsThreadId= */ 123); - } - } catch (RemoteException re) { - // TODO(sahinc): Log something meaningful - } - return 0; - } - - /** Implement the Parcelable interface */ @Override public int describeContents() { return 0; @@ -70,5 +70,6 @@ public class RcsThread implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mThreadId); } } diff --git a/telephony/java/android/telephony/ims/RcsThreadEvent.aidl b/telephony/java/android/telephony/ims/RcsThreadEvent.aidl new file mode 100644 index 000000000000..4a40d8906bbb --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadEvent.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsThreadEvent; diff --git a/telephony/java/android/telephony/ims/RcsThreadEvent.java b/telephony/java/android/telephony/ims/RcsThreadEvent.java new file mode 100644 index 000000000000..e10baab9d8c5 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadEvent.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcelable; + +/** + * An event that happened on an {@link RcsThread}. + * @hide - TODO(sahinc) make this public + */ +public abstract class RcsThreadEvent implements Parcelable { +} diff --git a/telephony/java/android/telephony/ims/RcsThreadIconChangedEvent.aidl b/telephony/java/android/telephony/ims/RcsThreadIconChangedEvent.aidl new file mode 100644 index 000000000000..82d985df4c6c --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadIconChangedEvent.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsThreadIconChangedEvent; diff --git a/telephony/java/android/telephony/ims/RcsThreadIconChangedEvent.java b/telephony/java/android/telephony/ims/RcsThreadIconChangedEvent.java new file mode 100644 index 000000000000..b308fef46435 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadIconChangedEvent.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * An event that indicates an {@link RcsGroupThread}'s icon was changed. + * @hide - TODO(sahinc) make this public + */ +public class RcsThreadIconChangedEvent extends RcsThreadEvent { + public static final Creator<RcsThreadIconChangedEvent> CREATOR = + new Creator<RcsThreadIconChangedEvent>() { + @Override + public RcsThreadIconChangedEvent createFromParcel(Parcel in) { + return new RcsThreadIconChangedEvent(in); + } + + @Override + public RcsThreadIconChangedEvent[] newArray(int size) { + return new RcsThreadIconChangedEvent[size]; + } + }; + + protected RcsThreadIconChangedEvent(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsThreadNameChangedEvent.aidl b/telephony/java/android/telephony/ims/RcsThreadNameChangedEvent.aidl new file mode 100644 index 000000000000..54a311d02958 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadNameChangedEvent.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsThreadNameChangedEvent; diff --git a/telephony/java/android/telephony/ims/RcsThreadNameChangedEvent.java b/telephony/java/android/telephony/ims/RcsThreadNameChangedEvent.java new file mode 100644 index 000000000000..6f5cfdf3b4c4 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadNameChangedEvent.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * An event that indicates an {@link RcsGroupThread}'s name was changed. + * @hide - TODO(sahinc) make this public + */ +public class RcsThreadNameChangedEvent extends RcsThreadEvent { + public static final Creator<RcsThreadNameChangedEvent> CREATOR = + new Creator<RcsThreadNameChangedEvent>() { + @Override + public RcsThreadNameChangedEvent createFromParcel(Parcel in) { + return new RcsThreadNameChangedEvent(in); + } + + @Override + public RcsThreadNameChangedEvent[] newArray(int size) { + return new RcsThreadNameChangedEvent[size]; + } + }; + + protected RcsThreadNameChangedEvent(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsThreadParticipantJoinedEvent.aidl b/telephony/java/android/telephony/ims/RcsThreadParticipantJoinedEvent.aidl new file mode 100644 index 000000000000..047a42466ee7 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadParticipantJoinedEvent.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsThreadParticipantJoinedEvent; diff --git a/telephony/java/android/telephony/ims/RcsThreadParticipantJoinedEvent.java b/telephony/java/android/telephony/ims/RcsThreadParticipantJoinedEvent.java new file mode 100644 index 000000000000..5c4073c430e7 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadParticipantJoinedEvent.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * An event that indicates an RCS participant has joined an {@link RcsGroupThread}. + * @hide - TODO(sahinc) make this public + */ +public class RcsThreadParticipantJoinedEvent extends RcsThreadEvent { + public static final Creator<RcsThreadParticipantJoinedEvent> CREATOR = + new Creator<RcsThreadParticipantJoinedEvent>() { + @Override + public RcsThreadParticipantJoinedEvent createFromParcel(Parcel in) { + return new RcsThreadParticipantJoinedEvent(in); + } + + @Override + public RcsThreadParticipantJoinedEvent[] newArray(int size) { + return new RcsThreadParticipantJoinedEvent[size]; + } + }; + + protected RcsThreadParticipantJoinedEvent(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsThreadParticipantLeftEvent.aidl b/telephony/java/android/telephony/ims/RcsThreadParticipantLeftEvent.aidl new file mode 100644 index 000000000000..52f9bbd3cd93 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadParticipantLeftEvent.aidl @@ -0,0 +1,20 @@ +/* + * + * 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. + */ + +package android.telephony.ims; + +parcelable RcsThreadParticipantLeftEvent; diff --git a/telephony/java/android/telephony/ims/RcsThreadParticipantLeftEvent.java b/telephony/java/android/telephony/ims/RcsThreadParticipantLeftEvent.java new file mode 100644 index 000000000000..4bf86b90ebb7 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadParticipantLeftEvent.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.telephony.ims; + +import android.os.Parcel; + +/** + * An event that indicates an RCS participant has left an {@link RcsGroupThread}. + * @hide - TODO(sahinc) make this public + */ +public class RcsThreadParticipantLeftEvent extends RcsThreadEvent { + public static final Creator<RcsThreadParticipantLeftEvent> CREATOR = + new Creator<RcsThreadParticipantLeftEvent>() { + @Override + public RcsThreadParticipantLeftEvent createFromParcel(Parcel in) { + return new RcsThreadParticipantLeftEvent(in); + } + + @Override + public RcsThreadParticipantLeftEvent[] newArray(int size) { + return new RcsThreadParticipantLeftEvent[size]; + } + }; + + protected RcsThreadParticipantLeftEvent(Parcel in) { + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsThreadQueryContinuationToken.aidl b/telephony/java/android/telephony/ims/RcsThreadQueryContinuationToken.aidl new file mode 100644 index 000000000000..7bcebfa08fcb --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadQueryContinuationToken.aidl @@ -0,0 +1,20 @@ +/* +** +** 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.telephony.ims; + +parcelable RcsThreadQueryContinuationToken; diff --git a/telephony/java/android/telephony/ims/RcsThreadQueryContinuationToken.java b/telephony/java/android/telephony/ims/RcsThreadQueryContinuationToken.java new file mode 100644 index 000000000000..931e93dc8bf1 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadQueryContinuationToken.java @@ -0,0 +1,52 @@ +/* + * 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.telephony.ims; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * A continuation token to provide for {@link RcsMessageStore#getRcsThreads}. Use this token to + * break large queries into manageable chunks + * @hide - TODO make this public + */ +public class RcsThreadQueryContinuationToken implements Parcelable { + protected RcsThreadQueryContinuationToken(Parcel in) { + } + + public static final Creator<RcsThreadQueryContinuationToken> CREATOR = + new Creator<RcsThreadQueryContinuationToken>() { + @Override + public RcsThreadQueryContinuationToken createFromParcel(Parcel in) { + return new RcsThreadQueryContinuationToken(in); + } + + @Override + public RcsThreadQueryContinuationToken[] newArray(int size) { + return new RcsThreadQueryContinuationToken[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + } +} diff --git a/telephony/java/android/telephony/ims/RcsThreadQueryParameters.aidl b/telephony/java/android/telephony/ims/RcsThreadQueryParameters.aidl new file mode 100644 index 000000000000..feb2d4dec094 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadQueryParameters.aidl @@ -0,0 +1,20 @@ +/* +** +** 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.telephony.ims; + +parcelable RcsThreadQueryParameters; diff --git a/telephony/java/android/telephony/ims/RcsThreadQueryParameters.java b/telephony/java/android/telephony/ims/RcsThreadQueryParameters.java new file mode 100644 index 000000000000..f2c4ab1884ca --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadQueryParameters.java @@ -0,0 +1,225 @@ +/* + * 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.telephony.ims; + +import android.annotation.CheckResult; +import android.os.Parcel; +import android.os.Parcelable; + +import java.security.InvalidParameterException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; + +/** + * The parameters to pass into {@link RcsMessageStore#getRcsThreads(RcsThreadQueryParameters)} in + * order to select a subset of {@link RcsThread}s present in the message store. + * @hide TODO - make the Builder and builder() public. The rest should stay internal only. + */ +public class RcsThreadQueryParameters implements Parcelable { + private final boolean mIsGroup; + private final Set<RcsParticipant> mRcsParticipants; + private final int mLimit; + private final boolean mIsAscending; + + RcsThreadQueryParameters(boolean isGroup, Set<RcsParticipant> participants, int limit, + boolean isAscending) { + mIsGroup = isGroup; + mRcsParticipants = participants; + mLimit = limit; + mIsAscending = isAscending; + } + + /** + * Returns a new builder to build a query with. + * TODO - make public + */ + public static Builder builder() { + return new Builder(); + } + + /** + * This is used in {@link com.android.internal.telephony.ims.RcsMessageStoreController} to get + * the list of participants. + * @hide + */ + public Set<RcsParticipant> getRcsParticipants() { + return mRcsParticipants; + } + + /** + * This is used in {@link com.android.internal.telephony.ims.RcsMessageStoreController} to get + * whether group threads should be queried + * @hide + */ + public boolean isGroupThread() { + return mIsGroup; + } + + /** + * This is used in {@link com.android.internal.telephony.ims.RcsMessageStoreController} to get + * the number of tuples the result query should be limited to. + */ + public int getLimit() { + return mLimit; + } + + /** + * This is used in {@link com.android.internal.telephony.ims.RcsMessageStoreController} to + * determine the sort order. + */ + public boolean isAscending() { + return mIsAscending; + } + + /** + * A helper class to build the {@link RcsThreadQueryParameters}. + */ + public static class Builder { + private boolean mIsGroupThread; + private Set<RcsParticipant> mParticipants; + private int mLimit = 100; + private boolean mIsAscending; + + /** + * Package private constructor for {@link RcsThreadQueryParameters.Builder}. To obtain this, + * {@link RcsThreadQueryParameters#builder()} needs to be called. + */ + Builder() { + mParticipants = new HashSet<>(); + } + + /** + * Limits the query to only return group threads. + * @param isGroupThread Whether to limit the query result to group threads. + * @return The same instance of the builder to chain parameters. + */ + @CheckResult + public Builder isGroupThread(boolean isGroupThread) { + mIsGroupThread = isGroupThread; + return this; + } + + /** + * Limits the query to only return threads that contain the given participant. + * @param participant The participant that must be included in all of the returned threads. + * @return The same instance of the builder to chain parameters. + */ + @CheckResult + public Builder withParticipant(RcsParticipant participant) { + mParticipants.add(participant); + return this; + } + + /** + * Limits the query to only return threads that contain the given list of participants. + * @param participants An iterable list of participants that must be included in all of the + * returned threads. + * @return The same instance of the builder to chain parameters. + */ + @CheckResult + public Builder withParticipants(Iterable<RcsParticipant> participants) { + for (RcsParticipant participant : participants) { + mParticipants.add(participant); + } + return this; + } + + /** + * Desired number of threads to be returned from the query. Passing in 0 will return all + * existing threads at once. The limit defaults to 100. + * @param limit The number to limit the query result to. + * @return The same instance of the builder to chain parameters. + * @throws InvalidParameterException If the given limit is negative. + */ + @CheckResult + public Builder limitResultsTo(int limit) throws InvalidParameterException { + if (limit < 0) { + throw new InvalidParameterException("The query limit must be non-negative"); + } + + mLimit = limit; + return this; + } + + /** + * Sorts the results returned from the query via thread IDs. + * + * TODO - add sorting support for other fields + * + * @param isAscending whether to sort in ascending order or not + * @return The same instance of the builder to chain parameters. + */ + @CheckResult + public Builder sort(boolean isAscending) { + mIsAscending = isAscending; + return this; + } + + /** + * Builds the {@link RcsThreadQueryParameters} to use in + * {@link RcsMessageStore#getRcsThreads(RcsThreadQueryParameters)} + * + * @return An instance of {@link RcsThreadQueryParameters} to use with the thread query. + */ + public RcsThreadQueryParameters build() { + return new RcsThreadQueryParameters( + mIsGroupThread, mParticipants, mLimit, mIsAscending); + } + } + + /** + * Parcelable boilerplate below. + */ + protected RcsThreadQueryParameters(Parcel in) { + mIsGroup = in.readBoolean(); + + ArrayList<RcsParticipant> participantArrayList = new ArrayList<>(); + in.readTypedList(participantArrayList, RcsParticipant.CREATOR); + mRcsParticipants = new HashSet<>(participantArrayList); + + mLimit = in.readInt(); + mIsAscending = in.readBoolean(); + } + + public static final Creator<RcsThreadQueryParameters> CREATOR = + new Creator<RcsThreadQueryParameters>() { + @Override + public RcsThreadQueryParameters createFromParcel(Parcel in) { + return new RcsThreadQueryParameters(in); + } + + @Override + public RcsThreadQueryParameters[] newArray(int size) { + return new RcsThreadQueryParameters[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeBoolean(mIsGroup); + dest.writeTypedList(new ArrayList<>(mRcsParticipants)); + dest.writeInt(mLimit); + dest.writeBoolean(mIsAscending); + } + +} diff --git a/telephony/java/android/telephony/ims/RcsThreadQueryResult.aidl b/telephony/java/android/telephony/ims/RcsThreadQueryResult.aidl new file mode 100644 index 000000000000..4b06529d1294 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadQueryResult.aidl @@ -0,0 +1,20 @@ +/* +** +** 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.telephony.ims; + +parcelable RcsThreadQueryResult; diff --git a/telephony/java/android/telephony/ims/RcsThreadQueryResult.java b/telephony/java/android/telephony/ims/RcsThreadQueryResult.java new file mode 100644 index 000000000000..47715f8410d6 --- /dev/null +++ b/telephony/java/android/telephony/ims/RcsThreadQueryResult.java @@ -0,0 +1,92 @@ +/* + * 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.telephony.ims; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.List; + +/** + * The result of a {@link RcsMessageStore#getRcsThreads(RcsThreadQueryContinuationToken, + * RcsThreadQueryParameters)} + * call. This class allows getting the token for querying the next batch of threads in order to + * prevent handling large amounts of data at once. + * + * @hide + */ +public class RcsThreadQueryResult implements Parcelable { + private RcsThreadQueryContinuationToken mContinuationToken; + private List<RcsThread> mRcsThreads; + + /** + * Internal constructor for {@link com.android.internal.telephony.ims.RcsMessageStoreController} + * to create query results + * + * @hide + */ + public RcsThreadQueryResult( + RcsThreadQueryContinuationToken continuationToken, List<RcsThread> rcsThreads) { + mContinuationToken = continuationToken; + mRcsThreads = rcsThreads; + } + + /** + * Returns a token to call + * {@link RcsMessageStore#getRcsThreads(RcsThreadQueryContinuationToken)} + * to get the next batch of {@link RcsThread}s. + */ + public RcsThreadQueryContinuationToken nextChunkToken() { + return mContinuationToken; + } + + /** + * Returns all the RcsThreads in the current query result. Call {@link + * RcsMessageStore#getRcsThreads(RcsThreadQueryContinuationToken)} to get the next batch of + * {@link RcsThread}s. + */ + public List<RcsThread> getThreads() { + return mRcsThreads; + } + + protected RcsThreadQueryResult(Parcel in) { + // TODO - implement + } + + public static final Creator<RcsThreadQueryResult> CREATOR = + new Creator<RcsThreadQueryResult>() { + @Override + public RcsThreadQueryResult createFromParcel(Parcel in) { + return new RcsThreadQueryResult(in); + } + + @Override + public RcsThreadQueryResult[] newArray(int size) { + return new RcsThreadQueryResult[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + // TODO - implement + } +} diff --git a/telephony/java/android/telephony/ims/aidl/IRcs.aidl b/telephony/java/android/telephony/ims/aidl/IRcs.aidl index b2e2fadca138..9badac5be230 100644 --- a/telephony/java/android/telephony/ims/aidl/IRcs.aidl +++ b/telephony/java/android/telephony/ims/aidl/IRcs.aidl @@ -16,14 +16,29 @@ package android.telephony.ims.aidl; +import android.telephony.ims.RcsParticipant; +import android.telephony.ims.Rcs1To1Thread; +import android.telephony.ims.RcsThreadQueryContinuationToken; +import android.telephony.ims.RcsThreadQueryParameters; +import android.telephony.ims.RcsThreadQueryResult; + /** * RPC definition between RCS storage APIs and phone process. * {@hide} */ interface IRcs { // RcsMessageStore APIs + RcsThreadQueryResult getRcsThreads(in RcsThreadQueryParameters queryParameters); + + RcsThreadQueryResult getRcsThreadsWithToken( + in RcsThreadQueryContinuationToken continuationToken); + void deleteThread(int threadId); + Rcs1To1Thread createRcs1To1Thread(in RcsParticipant participant); + + RcsParticipant createRcsParticipant(String canonicalAddress); + // RcsThread APIs int getMessageCount(int rcsThreadId); }
\ No newline at end of file diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index d9f5c3f6d0fa..02a6f311c1da 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -50,13 +50,13 @@ interface ITelephonyRegistry { void notifyDataActivity(int state); void notifyDataActivityForSubscriber(in int subId, int state); void notifyDataConnection(int state, boolean isDataConnectivityPossible, - String reason, String apn, String apnType, in LinkProperties linkProperties, + String apn, String apnType, in LinkProperties linkProperties, in NetworkCapabilities networkCapabilities, int networkType, boolean roaming); void notifyDataConnectionForSubscriber(int subId, int state, boolean isDataConnectivityPossible, - String reason, String apn, String apnType, in LinkProperties linkProperties, + String apn, String apnType, in LinkProperties linkProperties, in NetworkCapabilities networkCapabilities, int networkType, boolean roaming); - void notifyDataConnectionFailed(String reason, String apnType); - void notifyDataConnectionFailedForSubscriber(int subId, String reason, String apnType); + void notifyDataConnectionFailed(String apnType); + void notifyDataConnectionFailedForSubscriber(int subId, String apnType); void notifyCellLocation(in Bundle cellLocation); void notifyCellLocationForSubscriber(in int subId, in Bundle cellLocation); void notifyOtaspChanged(in int otaspMode); @@ -67,7 +67,7 @@ interface ITelephonyRegistry { void notifyPreciseCallState(int ringingCallState, int foregroundCallState, int backgroundCallState); void notifyDisconnectCause(int disconnectCause, int preciseDisconnectCause); - void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn, + void notifyPreciseDataConnectionFailed(String apnType, String apn, String failCause); void notifyCellInfoForSubscriber(in int subId, in List<CellInfo> cellInfo); void notifySrvccStateChanged(in int subId, in int lteState); diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index 21f3b92c6c4f..e87d28c6f9e9 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -79,8 +79,6 @@ public class PhoneConstants { public static final int SIM_ACTIVATION_TYPE_DATA = 1; public static final String PHONE_NAME_KEY = "phoneName"; - public static final String FAILURE_REASON_KEY = "reason"; - public static final String STATE_CHANGE_REASON_KEY = "reason"; public static final String DATA_NETWORK_TYPE_KEY = "networkType"; public static final String DATA_FAILURE_CAUSE_KEY = "failCause"; public static final String DATA_APN_TYPE_KEY = "apnType"; diff --git a/test-mock/src/android/test/mock/MockContentProvider.java b/test-mock/src/android/test/mock/MockContentProvider.java index 0ac35bc2628c..e9a5ff70a7cc 100644 --- a/test-mock/src/android/test/mock/MockContentProvider.java +++ b/test-mock/src/android/test/mock/MockContentProvider.java @@ -119,7 +119,7 @@ public class MockContentProvider extends ContentProvider { @Override public IBinder asBinder() { - throw new UnsupportedOperationException(); + return MockContentProvider.this.getIContentProviderBinder(); } @Override @@ -279,6 +279,13 @@ public class MockContentProvider extends ContentProvider { } /** + * @hide + */ + public IBinder getIContentProviderBinder() { + throw new UnsupportedOperationException("unimplemented mock method"); + } + + /** * Like {@link #attachInfo(Context, android.content.pm.ProviderInfo)}, but for use * when directly instantiating the provider for testing. * diff --git a/tests/RcsTests/Android.mk b/tests/RcsTests/Android.mk index adc7cab91389..7b348d73747a 100644 --- a/tests/RcsTests/Android.mk +++ b/tests/RcsTests/Android.mk @@ -11,7 +11,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base -LOCAL_STATIC_JAVA_LIBRARIES := junit android-support-test mockito-target-minus-junit4 +LOCAL_STATIC_JAVA_LIBRARIES := junit android-support-test mockito-target-minus-junit4 truth-prebuilt include $(BUILD_PACKAGE) diff --git a/tests/RcsTests/src/com/android/tests/rcs/RcsMessageStoreTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsMessageStoreTest.java index 290e04ce8abb..44277edcdb8c 100644 --- a/tests/RcsTests/src/com/android/tests/rcs/RcsMessageStoreTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsMessageStoreTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.tests.rcs; +package com.android.tests.ims; import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsMessageStore; diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsThreadQueryParametersTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsThreadQueryParametersTest.java new file mode 100644 index 000000000000..a890a389bdfc --- /dev/null +++ b/tests/RcsTests/src/com/android/tests/ims/RcsThreadQueryParametersTest.java @@ -0,0 +1,53 @@ +/* + * 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.tests.ims; + +import static com.google.common.truth.Truth.assertThat; + +import android.os.Bundle; +import android.support.test.runner.AndroidJUnit4; +import android.telephony.ims.RcsParticipant; +import android.telephony.ims.RcsThreadQueryParameters; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; + +@RunWith(AndroidJUnit4.class) +public class RcsThreadQueryParametersTest { + private RcsThreadQueryParameters mRcsThreadQueryParameters; + @Mock RcsParticipant mMockParticipant; + + @Test + public void testUnparceling() { + String key = "some key"; + mRcsThreadQueryParameters = RcsThreadQueryParameters.builder() + .isGroupThread(true) + .withParticipant(mMockParticipant) + .limitResultsTo(50) + .sort(true) + .build(); + + Bundle bundle = new Bundle(); + bundle.putParcelable(key, mRcsThreadQueryParameters); + mRcsThreadQueryParameters = bundle.getParcelable(key); + + assertThat(mRcsThreadQueryParameters.isGroupThread()).isTrue(); + assertThat(mRcsThreadQueryParameters.getRcsParticipants()).contains(mMockParticipant); + assertThat(mRcsThreadQueryParameters.getLimit()).isEqualTo(50); + assertThat(mRcsThreadQueryParameters.isAscending()).isTrue(); + } +} diff --git a/tests/RollbackTest/Android.mk b/tests/RollbackTest/Android.mk index f2bd40761e08..34aa258bf465 100644 --- a/tests/RollbackTest/Android.mk +++ b/tests/RollbackTest/Android.mk @@ -14,27 +14,49 @@ LOCAL_PATH:= $(call my-dir) -# RollbackTestAppV1 +# RollbackTestAppAv1.apk include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_MANIFEST_FILE := TestApp/AndroidManifestV1.xml -LOCAL_PACKAGE_NAME := RollbackTestAppV1 LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src) +LOCAL_MANIFEST_FILE := TestApp/Av1.xml +LOCAL_PACKAGE_NAME := RollbackTestAppAv1 include $(BUILD_PACKAGE) -ROLLBACK_TEST_APP_V1 := $(LOCAL_INSTALLED_MODULE) +ROLLBACK_TEST_APP_AV1 := $(LOCAL_INSTALLED_MODULE) -# RollbackTestAppV2 +# RollbackTestAppAv2.apk include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_MANIFEST_FILE := TestApp/AndroidManifestV2.xml -LOCAL_PACKAGE_NAME := RollbackTestAppV2 LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src) +LOCAL_MANIFEST_FILE := TestApp/Av2.xml +LOCAL_PACKAGE_NAME := RollbackTestAppAv2 include $(BUILD_PACKAGE) -ROLLBACK_TEST_APP_V2 := $(LOCAL_INSTALLED_MODULE) +ROLLBACK_TEST_APP_AV2 := $(LOCAL_INSTALLED_MODULE) + +# RollbackTestAppBv1.apk +include $(CLEAR_VARS) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src) +LOCAL_MANIFEST_FILE := TestApp/Bv1.xml +LOCAL_PACKAGE_NAME := RollbackTestAppBv1 +include $(BUILD_PACKAGE) +ROLLBACK_TEST_APP_BV1 := $(LOCAL_INSTALLED_MODULE) + +# RollbackTestAppBv2.apk +include $(CLEAR_VARS) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src) +LOCAL_MANIFEST_FILE := TestApp/Bv2.xml +LOCAL_PACKAGE_NAME := RollbackTestAppBv2 +include $(BUILD_PACKAGE) +ROLLBACK_TEST_APP_BV2 := $(LOCAL_INSTALLED_MODULE) # RollbackTest include $(CLEAR_VARS) @@ -43,12 +65,17 @@ LOCAL_PACKAGE_NAME := RollbackTest LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_COMPATIBILITY_SUITE := general-tests -LOCAL_CERTIFICATE := platform -LOCAL_JAVA_RESOURCE_FILES := $(ROLLBACK_TEST_APP_V1) $(ROLLBACK_TEST_APP_V2) -LOCAL_SDK_VERSION := test_current +LOCAL_JAVA_RESOURCE_FILES := \ + $(ROLLBACK_TEST_APP_AV1) \ + $(ROLLBACK_TEST_APP_AV2) \ + $(ROLLBACK_TEST_APP_BV1) \ + $(ROLLBACK_TEST_APP_BV2) +LOCAL_SDK_VERSION := system_current LOCAL_TEST_CONFIG := RollbackTest.xml include $(BUILD_PACKAGE) # Clean up local variables -ROLLBACK_TEST_APP_V1 := -ROLLBACK_TEST_APP_V2 := +ROLLBACK_TEST_APP_AV1 := +ROLLBACK_TEST_APP_AV2 := +ROLLBACK_TEST_APP_BV1 := +ROLLBACK_TEST_APP_BV2 := diff --git a/tests/RollbackTest/AndroidManifest.xml b/tests/RollbackTest/AndroidManifest.xml index d1535a3bbc74..e57a768ad1b5 100644 --- a/tests/RollbackTest/AndroidManifest.xml +++ b/tests/RollbackTest/AndroidManifest.xml @@ -17,9 +17,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.tests.rollback" > - <uses-permission android:name="android.permission.INSTALL_PACKAGES" /> - <uses-permission android:name="android.permission.DELETE_PACKAGES" /> - <application> <receiver android:name="com.android.tests.rollback.LocalIntentSender" android:exported="true" /> diff --git a/tests/RollbackTest/TEST_MAPPING b/tests/RollbackTest/TEST_MAPPING new file mode 100644 index 000000000000..c1d95ac85c23 --- /dev/null +++ b/tests/RollbackTest/TEST_MAPPING @@ -0,0 +1,7 @@ +{ + "presubmit": [ + { + "name": "RollbackTest" + } + ] +} diff --git a/tests/RollbackTest/TestApp/AndroidManifestV1.xml b/tests/RollbackTest/TestApp/Av1.xml index 45e9584c14d1..996d831013a8 100644 --- a/tests/RollbackTest/TestApp/AndroidManifestV1.xml +++ b/tests/RollbackTest/TestApp/Av1.xml @@ -15,14 +15,17 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.tests.rollback.testapp" + package="com.android.tests.rollback.testapp.A" android:versionCode="1" android:versionName="1.0" > <uses-sdk android:minSdkVersion="19" /> - <application android:label="Rollback Test App V1"> + <application android:label="Rollback Test App A v1"> + <meta-data android:name="version" android:value="1" /> + <receiver android:name="com.android.tests.rollback.testapp.ProcessUserData" + android:exported="true" /> <activity android:name="com.android.tests.rollback.testapp.MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/tests/RollbackTest/TestApp/AndroidManifestV2.xml b/tests/RollbackTest/TestApp/Av2.xml index 0104086c479d..21c7260b570b 100644 --- a/tests/RollbackTest/TestApp/AndroidManifestV2.xml +++ b/tests/RollbackTest/TestApp/Av2.xml @@ -15,14 +15,17 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.tests.rollback.testapp" + package="com.android.tests.rollback.testapp.A" android:versionCode="2" android:versionName="2.0" > <uses-sdk android:minSdkVersion="19" /> - <application android:label="Rollback Test App V2"> + <application android:label="Rollback Test App A v2"> + <meta-data android:name="version" android:value="2" /> + <receiver android:name="com.android.tests.rollback.testapp.ProcessUserData" + android:exported="true" /> <activity android:name="com.android.tests.rollback.testapp.MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/tests/RollbackTest/TestApp/Bv1.xml b/tests/RollbackTest/TestApp/Bv1.xml new file mode 100644 index 000000000000..de0fd0d6d616 --- /dev/null +++ b/tests/RollbackTest/TestApp/Bv1.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tests.rollback.testapp.B" + android:versionCode="1" + android:versionName="1.0" > + + + <uses-sdk android:minSdkVersion="19" /> + + <application android:label="Rollback Test App B v1"> + <meta-data android:name="version" android:value="1" /> + <receiver android:name="com.android.tests.rollback.testapp.ProcessUserData" + android:exported="true" /> + <activity android:name="com.android.tests.rollback.testapp.MainActivity"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> +</manifest> diff --git a/tests/RollbackTest/TestApp/Bv2.xml b/tests/RollbackTest/TestApp/Bv2.xml new file mode 100644 index 000000000000..6c2e66a3220c --- /dev/null +++ b/tests/RollbackTest/TestApp/Bv2.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tests.rollback.testapp.B" + android:versionCode="2" + android:versionName="2.0" > + + + <uses-sdk android:minSdkVersion="19" /> + + <application android:label="Rollback Test App B v2"> + <meta-data android:name="version" android:value="2" /> + <receiver android:name="com.android.tests.rollback.testapp.ProcessUserData" + android:exported="true" /> + <activity android:name="com.android.tests.rollback.testapp.MainActivity"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> +</manifest> diff --git a/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/MainActivity.java b/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/MainActivity.java index 1856bac0d9f9..9f1a0609d3f1 100644 --- a/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/MainActivity.java +++ b/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/MainActivity.java @@ -27,5 +27,11 @@ public class MainActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + try { + new ProcessUserData().processUserData(this); + } catch (ProcessUserData.UserDataException e) { + throw new AssertionError("Failed to process app user data", e); + } } } diff --git a/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/ProcessUserData.java b/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/ProcessUserData.java new file mode 100644 index 000000000000..fde6a83b6e56 --- /dev/null +++ b/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/ProcessUserData.java @@ -0,0 +1,106 @@ +/* + * 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.tests.rollback.testapp; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.os.Bundle; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Scanner; + +/** + * A broadcast reciever to check for and update user app data version + * compatibility. + */ +public class ProcessUserData extends BroadcastReceiver { + + /** + * Exception thrown in case of issue with user data. + */ + public static class UserDataException extends Exception { + public UserDataException(String message) { + super(message); + } + + public UserDataException(String message, Throwable cause) { + super(message, cause); + } + } + + @Override + public void onReceive(Context context, Intent intent) { + try { + processUserData(context); + setResultCode(1); + } catch (UserDataException e) { + setResultCode(0); + setResultData(e.getMessage()); + } + } + + /** + * Update the app's user data version to match the app version. + * + * @param context The application context. + * @throws UserDataException in case of problems with app user data. + */ + public void processUserData(Context context) throws UserDataException { + int appVersion = 0; + try { + ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo( + context.getPackageName(), PackageManager.GET_META_DATA); + Bundle bundle = appInfo.metaData; + appVersion = bundle.getInt("version"); + } catch (PackageManager.NameNotFoundException e) { + throw new UserDataException("Unable to get app version info", e); + } + + // Read the version of the app's user data and ensure it is compatible + // with our version of the application. + File versionFile = new File(context.getFilesDir(), "version.txt"); + try { + Scanner s = new Scanner(versionFile); + int userDataVersion = s.nextInt(); + s.close(); + + if (userDataVersion > appVersion) { + throw new UserDataException("User data is from version " + userDataVersion + + ", which is not compatible with this version " + appVersion + + " of the RollbackTestApp"); + } + } catch (FileNotFoundException e) { + // No problem. This is a fresh install of the app or the user data + // has been wiped. + } + + // Record the current version of the app in the user data. + try { + PrintWriter pw = new PrintWriter(versionFile); + pw.println(appVersion); + pw.close(); + } catch (IOException e) { + throw new UserDataException("Unable to write user data.", e); + } + } +} diff --git a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java index 02c1ce2e8b31..0ccfb19d3f0b 100644 --- a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java +++ b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java @@ -16,13 +16,17 @@ package com.android.tests.rollback; +import android.Manifest; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.rollback.RollbackInfo; import android.content.rollback.RollbackManager; import android.net.Uri; +import android.os.Handler; +import android.os.HandlerThread; import android.support.test.InstrumentationRegistry; import android.util.Log; @@ -34,10 +38,13 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; /** @@ -49,7 +56,8 @@ public class RollbackTest { private static final String TAG = "RollbackTest"; - private static final String TEST_APP_PACKAGE_NAME = "com.android.tests.rollback.testapp"; + private static final String TEST_APP_A = "com.android.tests.rollback.testapp.A"; + private static final String TEST_APP_B = "com.android.tests.rollback.testapp.B"; /** * Test basic rollbacks. @@ -71,85 +79,94 @@ public class RollbackTest { }; context.registerReceiver(enableRollbackReceiver, enableRollbackFilter); - // Register a broadcast receiver for notification when the rollback is - // done executing. - RollbackBroadcastReceiver broadcastReceiver = new RollbackBroadcastReceiver(); - RollbackManager rm = RollbackTestUtils.getRollbackManager(); - - // Uninstall com.android.tests.rollback.testapp - RollbackTestUtils.uninstall("com.android.tests.rollback.testapp"); - assertEquals(-1, RollbackTestUtils.getInstalledVersion(TEST_APP_PACKAGE_NAME)); - - // TODO: There is currently a race condition between when the app is - // uninstalled and when rollback manager deletes the rollback. Fix it - // so that's not the case! - for (int i = 0; i < 5; ++i) { - for (RollbackInfo info : rm.getRecentlyExecutedRollbacks()) { - if (TEST_APP_PACKAGE_NAME.equals(info.targetPackage.packageName)) { - Log.i(TAG, "Sleeping 1 second to wait for uninstall to take effect."); - Thread.sleep(1000); - break; + try { + RollbackTestUtils.adoptShellPermissionIdentity( + Manifest.permission.INSTALL_PACKAGES, + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.MANAGE_ROLLBACKS); + + // Register a broadcast receiver for notification when the rollback is + // done executing. + RollbackBroadcastReceiver broadcastReceiver = new RollbackBroadcastReceiver(); + RollbackManager rm = RollbackTestUtils.getRollbackManager(); + + // Uninstall TEST_APP_A + RollbackTestUtils.uninstall(TEST_APP_A); + assertEquals(-1, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + // TODO: There is currently a race condition between when the app is + // uninstalled and when rollback manager deletes the rollback. Fix it + // so that's not the case! + for (int i = 0; i < 5; ++i) { + for (RollbackInfo info : rm.getRecentlyExecutedRollbacks()) { + if (TEST_APP_A.equals(info.targetPackage.packageName)) { + Log.i(TAG, "Sleeping 1 second to wait for uninstall to take effect."); + Thread.sleep(1000); + break; + } } } - } - // The app should not be available for rollback. - assertNull(rm.getAvailableRollback(TEST_APP_PACKAGE_NAME)); - assertFalse(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_PACKAGE_NAME)); + // The app should not be available for rollback. + assertNull(rm.getAvailableRollback(TEST_APP_A)); + assertFalse(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_A)); - // There should be no recently executed rollbacks for this package. - for (RollbackInfo info : rm.getRecentlyExecutedRollbacks()) { - assertNotEquals(TEST_APP_PACKAGE_NAME, info.targetPackage.packageName); - } + // There should be no recently executed rollbacks for this package. + for (RollbackInfo info : rm.getRecentlyExecutedRollbacks()) { + assertNotEquals(TEST_APP_A, info.targetPackage.packageName); + } - // Install v1 of the app (without rollbacks enabled). - RollbackTestUtils.install("RollbackTestAppV1.apk", false); - assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_PACKAGE_NAME)); - - // Upgrade from v1 to v2, with rollbacks enabled. - RollbackTestUtils.install("RollbackTestAppV2.apk", true); - assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_PACKAGE_NAME)); - - // The app should now be available for rollback. - assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_PACKAGE_NAME)); - RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_PACKAGE_NAME); - assertNotNull(rollback); - assertEquals(TEST_APP_PACKAGE_NAME, rollback.targetPackage.packageName); - assertEquals(2, rollback.targetPackage.higherVersion.versionCode); - assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); - - // We should not have received any rollback requests yet. - // TODO: Possibly flaky if, by chance, some other app on device - // happens to be rolled back at the same time? - assertNull(broadcastReceiver.poll(0, TimeUnit.SECONDS)); - - // Roll back the app. - RollbackTestUtils.rollback(rollback); - assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_PACKAGE_NAME)); - - // Verify we received a broadcast for the rollback. - // TODO: Race condition between the timeout and when the broadcast is - // received could lead to test flakiness. - Intent broadcast = broadcastReceiver.poll(5, TimeUnit.SECONDS); - assertNotNull(broadcast); - assertEquals(TEST_APP_PACKAGE_NAME, broadcast.getData().getSchemeSpecificPart()); - assertNull(broadcastReceiver.poll(0, TimeUnit.SECONDS)); - - // Verify the recent rollback has been recorded. - rollback = null; - for (RollbackInfo r : rm.getRecentlyExecutedRollbacks()) { - if (TEST_APP_PACKAGE_NAME.equals(r.targetPackage.packageName)) { - assertNull(rollback); - rollback = r; + // Install v1 of the app (without rollbacks enabled). + RollbackTestUtils.install("RollbackTestAppAv1.apk", false); + assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + // Upgrade from v1 to v2, with rollbacks enabled. + RollbackTestUtils.install("RollbackTestAppAv2.apk", true); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + // The app should now be available for rollback. + assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_A)); + RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_A); + assertNotNull(rollback); + assertEquals(TEST_APP_A, rollback.targetPackage.packageName); + assertEquals(2, rollback.targetPackage.higherVersion.versionCode); + assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); + + // We should not have received any rollback requests yet. + // TODO: Possibly flaky if, by chance, some other app on device + // happens to be rolled back at the same time? + assertNull(broadcastReceiver.poll(0, TimeUnit.SECONDS)); + + // Roll back the app. + RollbackTestUtils.rollback(rollback); + assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + // Verify we received a broadcast for the rollback. + // TODO: Race condition between the timeout and when the broadcast is + // received could lead to test flakiness. + Intent broadcast = broadcastReceiver.poll(5, TimeUnit.SECONDS); + assertNotNull(broadcast); + assertEquals(TEST_APP_A, broadcast.getData().getSchemeSpecificPart()); + assertNull(broadcastReceiver.poll(0, TimeUnit.SECONDS)); + + // Verify the recent rollback has been recorded. + rollback = null; + for (RollbackInfo r : rm.getRecentlyExecutedRollbacks()) { + if (TEST_APP_A.equals(r.targetPackage.packageName)) { + assertNull(rollback); + rollback = r; + } } + assertNotNull(rollback); + assertEquals(TEST_APP_A, rollback.targetPackage.packageName); + assertEquals(2, rollback.targetPackage.higherVersion.versionCode); + assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); + + broadcastReceiver.unregister(); + context.unregisterReceiver(enableRollbackReceiver); + } finally { + RollbackTestUtils.dropShellPermissionIdentity(); } - assertNotNull(rollback); - assertEquals(TEST_APP_PACKAGE_NAME, rollback.targetPackage.packageName); - assertEquals(2, rollback.targetPackage.higherVersion.versionCode); - assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); - - broadcastReceiver.unregister(); - context.unregisterReceiver(enableRollbackReceiver); } /** @@ -157,65 +174,74 @@ public class RollbackTest { */ @Test public void testRollbackDataPersistence() throws Exception { - RollbackManager rm = RollbackTestUtils.getRollbackManager(); - - // Prep installation of com.android.tests.rollback.testapp - RollbackTestUtils.uninstall("com.android.tests.rollback.testapp"); - RollbackTestUtils.install("RollbackTestAppV1.apk", false); - RollbackTestUtils.install("RollbackTestAppV2.apk", true); - assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_PACKAGE_NAME)); - - // The app should now be available for rollback. - assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_PACKAGE_NAME)); - RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_PACKAGE_NAME); - assertNotNull(rollback); - assertEquals(TEST_APP_PACKAGE_NAME, rollback.targetPackage.packageName); - assertEquals(2, rollback.targetPackage.higherVersion.versionCode); - assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); - - // Reload the persisted data. - rm.reloadPersistedData(); - - // The app should still be available for rollback. - assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_PACKAGE_NAME)); - rollback = rm.getAvailableRollback(TEST_APP_PACKAGE_NAME); - assertNotNull(rollback); - assertEquals(TEST_APP_PACKAGE_NAME, rollback.targetPackage.packageName); - assertEquals(2, rollback.targetPackage.higherVersion.versionCode); - assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); - - // Roll back the app. - RollbackTestUtils.rollback(rollback); - assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_PACKAGE_NAME)); - - // Verify the recent rollback has been recorded. - rollback = null; - for (RollbackInfo r : rm.getRecentlyExecutedRollbacks()) { - if (TEST_APP_PACKAGE_NAME.equals(r.targetPackage.packageName)) { - assertNull(rollback); - rollback = r; + try { + RollbackTestUtils.adoptShellPermissionIdentity( + Manifest.permission.INSTALL_PACKAGES, + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.MANAGE_ROLLBACKS); + + RollbackManager rm = RollbackTestUtils.getRollbackManager(); + + // Prep installation of TEST_APP_A + RollbackTestUtils.uninstall(TEST_APP_A); + RollbackTestUtils.install("RollbackTestAppAv1.apk", false); + RollbackTestUtils.install("RollbackTestAppAv2.apk", true); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + // The app should now be available for rollback. + assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_A)); + RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_A); + assertNotNull(rollback); + assertEquals(TEST_APP_A, rollback.targetPackage.packageName); + assertEquals(2, rollback.targetPackage.higherVersion.versionCode); + assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); + + // Reload the persisted data. + rm.reloadPersistedData(); + + // The app should still be available for rollback. + assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_A)); + rollback = rm.getAvailableRollback(TEST_APP_A); + assertNotNull(rollback); + assertEquals(TEST_APP_A, rollback.targetPackage.packageName); + assertEquals(2, rollback.targetPackage.higherVersion.versionCode); + assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); + + // Roll back the app. + RollbackTestUtils.rollback(rollback); + assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + // Verify the recent rollback has been recorded. + rollback = null; + for (RollbackInfo r : rm.getRecentlyExecutedRollbacks()) { + if (TEST_APP_A.equals(r.targetPackage.packageName)) { + assertNull(rollback); + rollback = r; + } } - } - assertNotNull(rollback); - assertEquals(TEST_APP_PACKAGE_NAME, rollback.targetPackage.packageName); - assertEquals(2, rollback.targetPackage.higherVersion.versionCode); - assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); - - // Reload the persisted data. - rm.reloadPersistedData(); - - // Verify the recent rollback is still recorded. - rollback = null; - for (RollbackInfo r : rm.getRecentlyExecutedRollbacks()) { - if (TEST_APP_PACKAGE_NAME.equals(r.targetPackage.packageName)) { - assertNull(rollback); - rollback = r; + assertNotNull(rollback); + assertEquals(TEST_APP_A, rollback.targetPackage.packageName); + assertEquals(2, rollback.targetPackage.higherVersion.versionCode); + assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); + + // Reload the persisted data. + rm.reloadPersistedData(); + + // Verify the recent rollback is still recorded. + rollback = null; + for (RollbackInfo r : rm.getRecentlyExecutedRollbacks()) { + if (TEST_APP_A.equals(r.targetPackage.packageName)) { + assertNull(rollback); + rollback = r; + } } + assertNotNull(rollback); + assertEquals(TEST_APP_A, rollback.targetPackage.packageName); + assertEquals(2, rollback.targetPackage.higherVersion.versionCode); + assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); + } finally { + RollbackTestUtils.dropShellPermissionIdentity(); } - assertNotNull(rollback); - assertEquals(TEST_APP_PACKAGE_NAME, rollback.targetPackage.packageName); - assertEquals(2, rollback.targetPackage.higherVersion.versionCode); - assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); } /** @@ -224,26 +250,108 @@ public class RollbackTest { */ @Test public void testRollbackExpiration() throws Exception { - RollbackManager rm = RollbackTestUtils.getRollbackManager(); - RollbackTestUtils.uninstall("com.android.tests.rollback.testapp"); - RollbackTestUtils.install("RollbackTestAppV1.apk", false); - RollbackTestUtils.install("RollbackTestAppV2.apk", true); - assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_PACKAGE_NAME)); - - // The app should now be available for rollback. - assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_PACKAGE_NAME)); - RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_PACKAGE_NAME); - assertNotNull(rollback); - assertEquals(TEST_APP_PACKAGE_NAME, rollback.targetPackage.packageName); - assertEquals(2, rollback.targetPackage.higherVersion.versionCode); - assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); - - // Expire the rollback. - rm.expireRollbackForPackage(TEST_APP_PACKAGE_NAME); - - // The rollback should no longer be available. - assertNull(rm.getAvailableRollback(TEST_APP_PACKAGE_NAME)); - assertFalse(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_PACKAGE_NAME)); + try { + RollbackTestUtils.adoptShellPermissionIdentity( + Manifest.permission.INSTALL_PACKAGES, + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.MANAGE_ROLLBACKS); + + RollbackManager rm = RollbackTestUtils.getRollbackManager(); + RollbackTestUtils.uninstall(TEST_APP_A); + RollbackTestUtils.install("RollbackTestAppAv1.apk", false); + RollbackTestUtils.install("RollbackTestAppAv2.apk", true); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + // The app should now be available for rollback. + assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_A)); + RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_A); + assertNotNull(rollback); + assertEquals(TEST_APP_A, rollback.targetPackage.packageName); + assertEquals(2, rollback.targetPackage.higherVersion.versionCode); + assertEquals(1, rollback.targetPackage.lowerVersion.versionCode); + + // Expire the rollback. + rm.expireRollbackForPackage(TEST_APP_A); + + // The rollback should no longer be available. + assertNull(rm.getAvailableRollback(TEST_APP_A)); + assertFalse(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_A)); + } finally { + RollbackTestUtils.dropShellPermissionIdentity(); + } + } + + private static final String NO_RESPONSE = "NO RESPONSE"; + + // Calls into the test app to process user data. + // Asserts if the user data could not be processed or was version + // incompatible with the previously processed user data. + private void processUserData(String packageName) throws Exception { + Intent intent = new Intent(); + intent.setComponent(new ComponentName(packageName, + "com.android.tests.rollback.testapp.ProcessUserData")); + Context context = InstrumentationRegistry.getContext(); + + HandlerThread handlerThread = new HandlerThread("RollbackTestHandlerThread"); + handlerThread.start(); + + // It can sometimes take a while after rollback before the app will + // receive this broadcast, so try a few times in a loop. + String result = NO_RESPONSE; + for (int i = 0; result.equals(NO_RESPONSE) && i < 5; ++i) { + BlockingQueue<String> resultQueue = new LinkedBlockingQueue<>(); + context.sendOrderedBroadcast(intent, null, new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (getResultCode() == 1) { + resultQueue.add("OK"); + } else { + // If the test app doesn't receive the broadcast or + // fails to set the result data, then getResultData + // here returns the initial NO_RESPONSE data passed to + // the sendOrderedBroadcast call. + resultQueue.add(getResultData()); + } + } + }, new Handler(handlerThread.getLooper()), 0, NO_RESPONSE, null); + + result = resultQueue.poll(10, TimeUnit.SECONDS); + if (result == null) { + result = "ProcessUserData broadcast timed out"; + } + } + + handlerThread.quit(); + if (!"OK".equals(result)) { + fail(result); + } + } + + /** + * Test that app user data is rolled back. + * TODO: Stop ignoring this test once user data rollback is supported. + */ + @Ignore @Test + public void testUserDataRollback() throws Exception { + try { + RollbackTestUtils.adoptShellPermissionIdentity( + Manifest.permission.INSTALL_PACKAGES, + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.MANAGE_ROLLBACKS); + + RollbackTestUtils.uninstall(TEST_APP_A); + RollbackTestUtils.install("RollbackTestAppV1.apk", false); + processUserData(TEST_APP_A); + RollbackTestUtils.install("RollbackTestAppV2.apk", true); + processUserData(TEST_APP_A); + + RollbackManager rm = RollbackTestUtils.getRollbackManager(); + RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_A); + RollbackTestUtils.rollback(rollback); + processUserData(TEST_APP_A); + } finally { + RollbackTestUtils.dropShellPermissionIdentity(); + } } /** @@ -270,4 +378,164 @@ public class RollbackTest { // called, even when the test fails? broadcastReceiver.unregister(); } + + /** + * Regression test for rollback in the case when multiple apps are + * available for rollback at the same time. + */ + @Test + public void testMultipleRollbackAvailable() throws Exception { + try { + RollbackTestUtils.adoptShellPermissionIdentity( + Manifest.permission.INSTALL_PACKAGES, + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.MANAGE_ROLLBACKS); + RollbackManager rm = RollbackTestUtils.getRollbackManager(); + + // Prep installation of the test apps. + RollbackTestUtils.uninstall(TEST_APP_A); + RollbackTestUtils.install("RollbackTestAppAv1.apk", false); + RollbackTestUtils.install("RollbackTestAppAv2.apk", true); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + RollbackTestUtils.uninstall(TEST_APP_B); + RollbackTestUtils.install("RollbackTestAppBv1.apk", false); + RollbackTestUtils.install("RollbackTestAppBv2.apk", true); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_B)); + + // Both test apps should now be available for rollback, and the + // targetPackage returned for rollback should be correct. + RollbackInfo rollbackA = rm.getAvailableRollback(TEST_APP_A); + assertNotNull(rollbackA); + assertEquals(TEST_APP_A, rollbackA.targetPackage.packageName); + + RollbackInfo rollbackB = rm.getAvailableRollback(TEST_APP_B); + assertNotNull(rollbackB); + assertEquals(TEST_APP_B, rollbackB.targetPackage.packageName); + + // Executing rollback should roll back the correct package. + RollbackTestUtils.rollback(rollbackA); + assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_B)); + + RollbackTestUtils.uninstall(TEST_APP_A); + RollbackTestUtils.install("RollbackTestAppAv1.apk", false); + RollbackTestUtils.install("RollbackTestAppAv2.apk", true); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + + RollbackTestUtils.rollback(rollbackB); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_B)); + } finally { + RollbackTestUtils.dropShellPermissionIdentity(); + } + } + + /** + * Test that the MANAGE_ROLLBACKS permission is required to call + * RollbackManager APIs. + */ + @Test + public void testManageRollbacksPermission() throws Exception { + // We shouldn't be allowed to call any of the RollbackManager APIs + // without the MANAGE_ROLLBACKS permission. + RollbackManager rm = RollbackTestUtils.getRollbackManager(); + + try { + rm.getAvailableRollback(TEST_APP_A); + fail("expected SecurityException"); + } catch (SecurityException e) { + // Expected. + } + + try { + rm.getPackagesWithAvailableRollbacks(); + fail("expected SecurityException"); + } catch (SecurityException e) { + // Expected. + } + + try { + rm.getRecentlyExecutedRollbacks(); + fail("expected SecurityException"); + } catch (SecurityException e) { + // Expected. + } + + try { + // TODO: What if the implementation checks arguments for non-null + // first? Then this test isn't valid. + rm.executeRollback(null, null); + fail("expected SecurityException"); + } catch (SecurityException e) { + // Expected. + } + + try { + rm.reloadPersistedData(); + fail("expected SecurityException"); + } catch (SecurityException e) { + // Expected. + } + + try { + rm.expireRollbackForPackage(TEST_APP_A); + fail("expected SecurityException"); + } catch (SecurityException e) { + // Expected. + } + } + + /** + * Test rollback of multi-package installs. + * TODO: Stop ignoring this test once support for multi-package rollback + * is implemented. + */ + @Ignore @Test + public void testMultiPackage() throws Exception { + try { + RollbackTestUtils.adoptShellPermissionIdentity( + Manifest.permission.INSTALL_PACKAGES, + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.MANAGE_ROLLBACKS); + RollbackManager rm = RollbackTestUtils.getRollbackManager(); + + // Prep installation of the test apps. + RollbackTestUtils.uninstall(TEST_APP_A); + RollbackTestUtils.uninstall(TEST_APP_B); + RollbackTestUtils.installMultiPackage(false, + "RollbackTestAppAv1.apk", + "RollbackTestAppBv1.apk"); + RollbackTestUtils.installMultiPackage(true, + "RollbackTestAppAv2.apk", + "RollbackTestAppBv2.apk"); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_B)); + + // TEST_APP_A should now be available for rollback. + assertTrue(rm.getPackagesWithAvailableRollbacks().contains(TEST_APP_A)); + RollbackInfo rollback = rm.getAvailableRollback(TEST_APP_A); + assertNotNull(rollback); + + // TODO: Test the dependent apps for rollback are correct once we + // support that in the RollbackInfo API. + + // Rollback the app. It should cause both test apps to be rolled + // back. + RollbackTestUtils.rollback(rollback); + assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A)); + assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_B)); + + // We should not see a recent rollback listed for TEST_APP_B + for (RollbackInfo r : rm.getRecentlyExecutedRollbacks()) { + assertNotEquals(TEST_APP_B, r.targetPackage.packageName); + } + + // TODO: Test the listed dependent apps for the recently executed + // rollback are correct once we support that in the RollbackInfo + // API. + } finally { + RollbackTestUtils.dropShellPermissionIdentity(); + } + } } diff --git a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java index c5ce3fa46d46..fbc3d8f1cd34 100644 --- a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java +++ b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java @@ -135,15 +135,64 @@ class RollbackTestUtils { assertStatusSuccess(LocalIntentSender.getIntentSenderResult()); } - // TODO: Unused - static void adoptShellPermissionIdentity() { + /** + * Installs the apks with the given resource names as an atomic set. + * + * @param enableRollback if rollback should be enabled. + * @param resourceNames names of the class loader resource for the apks to + * install. + * @throws AssertionError if the installation fails. + */ + static void installMultiPackage(boolean enableRollback, String... resourceNames) + throws InterruptedException, IOException { + Context context = InstrumentationRegistry.getContext(); + PackageInstaller packageInstaller = context.getPackageManager().getPackageInstaller(); + + PackageInstaller.SessionParams multiPackageParams = new PackageInstaller.SessionParams( + PackageInstaller.SessionParams.MODE_FULL_INSTALL); + multiPackageParams.setMultiPackage(); + if (enableRollback) { + // TODO: Do we set this on the parent params, the child params, or + // both? + multiPackageParams.setEnableRollback(); + } + int multiPackageId = packageInstaller.createSession(multiPackageParams); + PackageInstaller.Session multiPackage = packageInstaller.openSession(multiPackageId); + + for (String resourceName : resourceNames) { + PackageInstaller.Session session = null; + PackageInstaller.SessionParams params = new PackageInstaller.SessionParams( + PackageInstaller.SessionParams.MODE_FULL_INSTALL); + if (enableRollback) { + params.setEnableRollback(); + } + int sessionId = packageInstaller.createSession(params); + session = packageInstaller.openSession(sessionId); + + ClassLoader loader = RollbackTest.class.getClassLoader(); + try (OutputStream packageInSession = session.openWrite("package", 0, -1); + InputStream is = loader.getResourceAsStream(resourceName);) { + byte[] buffer = new byte[4096]; + int n; + while ((n = is.read(buffer)) >= 0) { + packageInSession.write(buffer, 0, n); + } + } + multiPackage.addChildSessionId(sessionId); + } + + // Commit the session (this will start the installation workflow). + multiPackage.commit(LocalIntentSender.getIntentSender()); + assertStatusSuccess(LocalIntentSender.getIntentSenderResult()); + } + + static void adoptShellPermissionIdentity(String... permissions) { InstrumentationRegistry .getInstrumentation() .getUiAutomation() - .adoptShellPermissionIdentity(); + .adoptShellPermissionIdentity(permissions); } - // TODO: Unused static void dropShellPermissionIdentity() { InstrumentationRegistry .getInstrumentation() diff --git a/tests/net/java/android/net/NetworkStatsTest.java b/tests/net/java/android/net/NetworkStatsTest.java index 1e3a49bd8cc8..2c2afd4c6f1c 100644 --- a/tests/net/java/android/net/NetworkStatsTest.java +++ b/tests/net/java/android/net/NetworkStatsTest.java @@ -832,25 +832,23 @@ public class NetworkStatsTest { 0 /* operations */); // Traffic measured for the root uid on the base interface if eBPF is in use. - // Incorrectly includes appEntry's bytes and packets, plus IPv4-IPv6 translation - // overhead (20 bytes per packet), only for TX traffic. final NetworkStats.Entry ebpfRootUidEntry = new NetworkStats.Entry( baseIface, rootUid, SET_DEFAULT, TAG_NONE, 163577 /* rxBytes */, 187 /* rxPackets */, - 1169942 /* txBytes */, - 13902 /* txPackets */, + 17607 /* txBytes */, + 97 /* txPackets */, 0 /* operations */); // Traffic measured for the root uid on the base interface if xt_qtaguid is in use. // Incorrectly includes appEntry's bytes and packets, plus IPv4-IPv6 translation - // overhead (20 bytes per packet), in both directions. + // overhead (20 bytes per packet), in rx direction. final NetworkStats.Entry xtRootUidEntry = new NetworkStats.Entry( baseIface, rootUid, SET_DEFAULT, TAG_NONE, 31113087 /* rxBytes */, 22588 /* rxPackets */, - 1169942 /* txBytes */, - 13902 /* txPackets */, + 17607 /* txBytes */, + 97 /* txPackets */, 0 /* operations */); final NetworkStats.Entry otherEntry = new NetworkStats.Entry( diff --git a/tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java b/tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java index 788924b1d3bf..90bf7b1a83ed 100644 --- a/tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java +++ b/tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java @@ -159,7 +159,7 @@ public class NetworkStatsFactoryTest { assertStatsEntry(stats, "v4-wlan0", 1000, SET_DEFAULT, 0x0, 30812L, 2310L); assertStatsEntry(stats, "v4-wlan0", 10102, SET_DEFAULT, 0x0, 10022L, 3330L); assertStatsEntry(stats, "v4-wlan0", 10060, SET_DEFAULT, 0x0, 9532772L, 254112L); - assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, 15229L, 5766L); + assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, 15229L, 0L); assertStatsEntry(stats, "wlan0", 1000, SET_DEFAULT, 0x0, 6126L, 2013L); assertStatsEntry(stats, "wlan0", 10013, SET_DEFAULT, 0x0, 0L, 144L); assertStatsEntry(stats, "wlan0", 10018, SET_DEFAULT, 0x0, 5980263L, 167667L); @@ -170,6 +170,8 @@ public class NetworkStatsFactoryTest { assertStatsEntry(stats, "dummy0", 0, SET_DEFAULT, 0x0, 0L, 168L); assertStatsEntry(stats, "lo", 0, SET_DEFAULT, 0x0, 1288L, 1288L); + assertNoStatsEntry(stats, "wlan0", 1029, SET_DEFAULT, 0x0); + NetworkStatsFactory.clearStackedIfaces(); } @@ -191,12 +193,12 @@ public class NetworkStatsFactoryTest { // Stats snapshot before the download stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat_100mb_download_before); assertStatsEntry(stats, "v4-wlan0", 10106, SET_FOREGROUND, 0x0, appRxBytesBefore, 5199872L); - assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesBefore, 647888L); + assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesBefore, 0L); // Stats snapshot after the download stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat_100mb_download_after); assertStatsEntry(stats, "v4-wlan0", 10106, SET_FOREGROUND, 0x0, appRxBytesAfter, 7867488L); - assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesAfter, 647587L); + assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesAfter, 0L); NetworkStatsFactory.clearStackedIfaces(); } @@ -252,6 +254,15 @@ public class NetworkStatsFactoryTest { assertEquals("unexpected txBytes", txBytes, entry.txBytes); } + private static void assertNoStatsEntry(NetworkStats stats, String iface, int uid, int set, + int tag) { + final int i = stats.findIndex(iface, uid, set, tag, METERED_NO, ROAMING_NO, + DEFAULT_NETWORK_NO); + if (i >= 0) { + fail("unexpected NetworkStats entry at " + i); + } + } + private static void assertStatsEntry(NetworkStats stats, String iface, int uid, int set, int tag, long rxBytes, long rxPackets, long txBytes, long txPackets) { final int i = stats.findIndex(iface, uid, set, tag, METERED_NO, ROAMING_NO, diff --git a/tests/net/res/raw/xt_qtaguid_with_clat b/tests/net/res/raw/xt_qtaguid_with_clat index 77e5c7ba8e62..6cd7499545be 100644 --- a/tests/net/res/raw/xt_qtaguid_with_clat +++ b/tests/net/res/raw/xt_qtaguid_with_clat @@ -7,7 +7,7 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 7 v4-wlan0 0x0 10060 1 1448660 1041 31192 753 1448660 1041 0 0 0 0 31192 753 0 0 0 0 8 v4-wlan0 0x0 10102 0 9702 16 2870 23 9702 16 0 0 0 0 2870 23 0 0 0 0 9 v4-wlan0 0x0 10102 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -10 wlan0 0x0 0 0 11058671 7892 312046 5113 11043898 7811 13117 61 1656 20 306544 5046 3230 38 2272 29 +10 wlan0 0x0 0 0 11058671 7892 0 0 11043898 7811 13117 61 1656 20 0 0 0 0 0 0 11 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 wlan0 0x0 1000 0 6126 13 2013 16 5934 11 192 2 0 0 1821 14 192 2 0 0 13 wlan0 0x0 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -41,3 +41,5 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 41 dummy0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 lo 0x0 0 0 1288 16 1288 16 0 0 532 8 756 8 0 0 532 8 756 8 43 lo 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +44 wlan0 0x0 1029 0 0 0 312046 5113 0 0 0 0 0 0 306544 5046 3230 38 2272 29 +45 wlan0 0x0 1029 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
\ No newline at end of file diff --git a/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after b/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after index c78f84f3c655..9f86153a33cf 100644 --- a/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after +++ b/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after @@ -9,7 +9,7 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 9 v4-wlan0 0x0 10057 1 728 7 392 7 0 0 728 7 0 0 0 0 392 7 0 0 10 v4-wlan0 0x0 10106 0 2232 18 2232 18 0 0 2232 18 0 0 0 0 2232 18 0 0 11 v4-wlan0 0x0 10106 1 432952718 314238 5442288 121260 432950238 314218 2480 20 0 0 5433900 121029 8388 231 0 0 -12 wlan0 0x0 0 0 440746376 329772 8524052 130894 439660007 315369 232001 1276 854368 13127 7871216 121284 108568 1325 544268 8285 +12 wlan0 0x0 0 0 440746376 329772 0 0 439660007 315369 232001 1276 854368 13127 0 0 0 0 0 0 13 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 wlan0 0x0 1000 0 77113 272 56151 575 77113 272 0 0 0 0 19191 190 36960 385 0 0 15 wlan0 0x0 1000 1 20227 80 8356 72 18539 74 1688 6 0 0 7562 66 794 6 0 0 @@ -185,3 +185,5 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 185 wlan0 0xffffff0900000000 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 186 dummy0 0x0 0 0 0 0 168 3 0 0 0 0 0 0 0 0 0 0 168 3 187 dummy0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +188 wlan0 0x0 1029 0 0 0 8524052 130894 0 0 0 0 0 0 7871216 121284 108568 1325 544268 8285 +189 wlan0 0x0 1029 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before b/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before index d0353876c8d3..ce4bcc3a3b43 100644 --- a/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before +++ b/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before @@ -9,7 +9,7 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 9 v4-wlan0 0x0 10057 1 728 7 392 7 0 0 728 7 0 0 0 0 392 7 0 0 10 v4-wlan0 0x0 10106 0 1488 12 1488 12 0 0 1488 12 0 0 0 0 1488 12 0 0 11 v4-wlan0 0x0 10106 1 323981189 235142 3509032 84542 323979453 235128 1736 14 0 0 3502676 84363 6356 179 0 0 -12 wlan0 0x0 0 0 330187296 250652 5855801 94173 329106990 236273 226202 1255 854104 13124 5208040 84634 103637 1256 544124 8283 +12 wlan0 0x0 0 0 330187296 250652 0 0 329106990 236273 226202 1255 854104 13124 0 0 0 0 0 0 13 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 wlan0 0x0 1000 0 77113 272 56151 575 77113 272 0 0 0 0 19191 190 36960 385 0 0 15 wlan0 0x0 1000 1 20227 80 8356 72 18539 74 1688 6 0 0 7562 66 794 6 0 0 @@ -183,3 +183,5 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 183 wlan0 0xffffff0900000000 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 184 dummy0 0x0 0 0 0 0 168 3 0 0 0 0 0 0 0 0 0 0 168 3 185 dummy0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +186 wlan0 0x0 1029 0 0 0 5855801 94173 0 0 0 0 0 0 5208040 84634 103637 1256 544124 8283 +187 wlan0 0x0 1029 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/net/res/raw/xt_qtaguid_with_clat_simple b/tests/net/res/raw/xt_qtaguid_with_clat_simple index 7f0e56f3ef6b..8c132e7e0a0e 100644 --- a/tests/net/res/raw/xt_qtaguid_with_clat_simple +++ b/tests/net/res/raw/xt_qtaguid_with_clat_simple @@ -1,5 +1,6 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packets rx_tcp_bytes rx_tcp_packets rx_udp_bytes rx_udp_packets rx_other_bytes rx_other_packets tx_tcp_bytes tx_tcp_packets tx_udp_bytes tx_udp_packets tx_other_bytes tx_other_packets -2 v4-wlan0 0x0 10060 0 42600 213 4100 41 42600 213 4100 41 0 0 0 0 0 0 0 0 +2 v4-wlan0 0x0 10060 0 42600 213 4100 41 42600 213 0 0 0 0 4100 41 0 0 0 0 3 v4-wlan0 0x0 10060 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4 wlan0 0x0 0 0 46860 213 4920 41 46860 213 4920 41 0 0 0 0 0 0 0 0 +4 wlan0 0x0 0 0 46860 213 0 0 46860 213 0 0 0 0 0 0 0 0 0 0 5 wlan0 0x0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +6 wlan0 0x0 1029 0 0 0 4920 41 0 0 0 0 0 0 4920 41 0 0 0 0 diff --git a/tools/aapt/ConfigDescription.h b/tools/aapt/ConfigDescription.h index 09430f2532fa..b4ea624524b3 100644 --- a/tools/aapt/ConfigDescription.h +++ b/tools/aapt/ConfigDescription.h @@ -29,7 +29,7 @@ struct ConfigDescription : public android::ResTable_config { size = sizeof(android::ResTable_config); } - ConfigDescription(const android::ResTable_config&o) { // NOLINT(implicit) + ConfigDescription(const android::ResTable_config&o) { // NOLINT(google-explicit-constructor) *static_cast<android::ResTable_config*>(this) = o; size = sizeof(android::ResTable_config); } diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index ba498e19f837..c42a8889e373 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -170,6 +170,7 @@ cc_test_host { srcs: [ "test/Builders.cpp", "test/Common.cpp", + "test/Fixture.cpp", "**/*_test.cpp", ] + toolSources, static_libs: [ @@ -177,7 +178,10 @@ cc_test_host { "libgmock", ], defaults: ["aapt2_defaults"], - data: ["integration-tests/CompileTest/**/*"], + data: [ + "integration-tests/CompileTest/**/*", + "integration-tests/CommandTests/**/*" + ], } // ========================================================== diff --git a/tools/aapt2/Debug.cpp b/tools/aapt2/Debug.cpp index 9460c9e596e9..5f664f5fdd5c 100644 --- a/tools/aapt2/Debug.cpp +++ b/tools/aapt2/Debug.cpp @@ -445,7 +445,7 @@ class XmlPrinter : public xml::ConstVisitor { public: using xml::ConstVisitor::Visit; - XmlPrinter(Printer* printer) : printer_(printer) { + explicit XmlPrinter(Printer* printer) : printer_(printer) { } void Visit(const xml::Element* el) override { diff --git a/tools/aapt2/Resource.h b/tools/aapt2/Resource.h index dd5c751967b8..67ba895e51d1 100644 --- a/tools/aapt2/Resource.h +++ b/tools/aapt2/Resource.h @@ -113,7 +113,7 @@ struct ResourceNameRef { ResourceNameRef() = default; ResourceNameRef(const ResourceNameRef&) = default; ResourceNameRef(ResourceNameRef&&) = default; - ResourceNameRef(const ResourceName& rhs); // NOLINT(implicit) + ResourceNameRef(const ResourceName& rhs); // NOLINT(google-explicit-constructor) ResourceNameRef(const android::StringPiece& p, ResourceType t, const android::StringPiece& e); ResourceNameRef& operator=(const ResourceNameRef& rhs) = default; ResourceNameRef& operator=(ResourceNameRef&& rhs) = default; @@ -144,7 +144,7 @@ struct ResourceId { ResourceId(); ResourceId(const ResourceId& rhs); - ResourceId(uint32_t res_id); // NOLINT(implicit) + ResourceId(uint32_t res_id); // NOLINT(google-explicit-constructor) ResourceId(uint8_t p, uint8_t t, uint16_t e); bool is_valid() const; diff --git a/tools/aapt2/cmd/Command.cpp b/tools/aapt2/cmd/Command.cpp index bdee5c9d4909..4424a357c1dd 100644 --- a/tools/aapt2/cmd/Command.cpp +++ b/tools/aapt2/cmd/Command.cpp @@ -21,80 +21,97 @@ #include <string> #include <vector> +#include "android-base/stringprintf.h" +#include "android-base/utf8.h" #include "androidfw/StringPiece.h" #include "util/Util.h" +using android::base::StringPrintf; using android::StringPiece; namespace aapt { -void Command::AddRequiredFlag(const StringPiece& name, - const StringPiece& description, std::string* value) { - auto func = [value](const StringPiece& arg) -> bool { - *value = arg.to_string(); +std::string GetSafePath(const StringPiece& arg) { +#ifdef _WIN32 + // If the path exceeds the maximum path length for Windows, encode the path using the + // extended-length prefix + std::wstring path16; + CHECK(android::base::UTF8PathToWindowsLongPath(arg.data(), &path16)) + << "Failed to convert file path to UTF-16: file path " << arg.data(); + + std::string path8; + CHECK(android::base::WideToUTF8(path16, &path8)) + << "Failed to convert file path back to UTF-8: file path " << arg.data(); + + return path8; +#else + return arg.to_string(); +#endif +} + +void Command::AddRequiredFlag(const StringPiece& name, const StringPiece& description, + std::string* value, uint32_t flags) { + auto func = [value, flags](const StringPiece& arg) -> bool { + *value = (flags & Command::kPath) ? GetSafePath(arg) : arg.to_string(); return true; }; - flags_.push_back(Flag{name.to_string(), description.to_string(), func, true, 1, false}); + flags_.emplace_back(Flag(name, description, /* required */ true, /* num_args */ 1, func)); } -void Command::AddRequiredFlagList(const StringPiece& name, - const StringPiece& description, - std::vector<std::string>* value) { - auto func = [value](const StringPiece& arg) -> bool { - value->push_back(arg.to_string()); +void Command::AddRequiredFlagList(const StringPiece& name, const StringPiece& description, + std::vector<std::string>* value, uint32_t flags) { + auto func = [value, flags](const StringPiece& arg) -> bool { + value->push_back((flags & Command::kPath) ? GetSafePath(arg) : arg.to_string()); return true; }; - flags_.push_back(Flag{name.to_string(), description.to_string(), func, true, 1, false}); + flags_.emplace_back(Flag(name, description, /* required */ true, /* num_args */ 1, func)); } -void Command::AddOptionalFlag(const StringPiece& name, - const StringPiece& description, - Maybe<std::string>* value) { - auto func = [value](const StringPiece& arg) -> bool { - *value = arg.to_string(); +void Command::AddOptionalFlag(const StringPiece& name, const StringPiece& description, + Maybe<std::string>* value, uint32_t flags) { + auto func = [value, flags](const StringPiece& arg) -> bool { + *value = (flags & Command::kPath) ? GetSafePath(arg) : arg.to_string(); return true; }; - flags_.push_back(Flag{name.to_string(), description.to_string(), func, false, 1, false}); + flags_.emplace_back(Flag(name, description, /* required */ false, /* num_args */ 1, func)); } -void Command::AddOptionalFlagList(const StringPiece& name, - const StringPiece& description, - std::vector<std::string>* value) { - auto func = [value](const StringPiece& arg) -> bool { - value->push_back(arg.to_string()); +void Command::AddOptionalFlagList(const StringPiece& name, const StringPiece& description, + std::vector<std::string>* value, uint32_t flags) { + auto func = [value, flags](const StringPiece& arg) -> bool { + value->push_back((flags & Command::kPath) ? GetSafePath(arg) : arg.to_string()); return true; }; - flags_.push_back(Flag{name.to_string(), description.to_string(), func, false, 1, false}); + flags_.emplace_back(Flag(name, description, /* required */ false, /* num_args */ 1, func)); } -void Command::AddOptionalFlagList(const StringPiece& name, - const StringPiece& description, - std::unordered_set<std::string>* value) { +void Command::AddOptionalFlagList(const StringPiece& name, const StringPiece& description, + std::unordered_set<std::string>* value) { auto func = [value](const StringPiece& arg) -> bool { value->insert(arg.to_string()); return true; }; - flags_.push_back(Flag{name.to_string(), description.to_string(), func, false, 1, false}); + flags_.emplace_back(Flag(name, description, /* required */ false, /* num_args */ 1, func)); } -void Command::AddOptionalSwitch(const StringPiece& name, - const StringPiece& description, bool* value) { +void Command::AddOptionalSwitch(const StringPiece& name, const StringPiece& description, + bool* value) { auto func = [value](const StringPiece& arg) -> bool { *value = true; return true; }; - flags_.push_back(Flag{name.to_string(), description.to_string(), func, false, 0, false}); + flags_.emplace_back(Flag(name, description, /* required */ false, /* num_args */ 0, func)); } void Command::AddOptionalSubcommand(std::unique_ptr<Command>&& subcommand, bool experimental) { - subcommand->fullname_ = name_ + " " + subcommand->name_; + subcommand->full_subcommand_name_ = StringPrintf("%s %s", name_.data(), subcommand->name_.data()); if (experimental) { experimental_subcommands_.push_back(std::move(subcommand)); } else { @@ -102,14 +119,14 @@ void Command::AddOptionalSubcommand(std::unique_ptr<Command>&& subcommand, bool } } -void Command::SetDescription(const android::StringPiece& description) { +void Command::SetDescription(const StringPiece& description) { description_ = description.to_string(); } void Command::Usage(std::ostream* out) { constexpr size_t kWidth = 50; - *out << fullname_; + *out << full_subcommand_name_; if (!subcommands_.empty()) { *out << " [subcommand]"; @@ -117,7 +134,7 @@ void Command::Usage(std::ostream* out) { *out << " [options]"; for (const Flag& flag : flags_) { - if (flag.required) { + if (flag.is_required) { *out << " " << flag.name << " arg"; } } @@ -160,29 +177,31 @@ void Command::Usage(std::ostream* out) { out->flush(); } -int Command::Execute(const std::vector<android::StringPiece>& args, std::ostream* out_error) { +int Command::Execute(const std::vector<StringPiece>& args, std::ostream* out_error) { std::vector<std::string> file_args; for (size_t i = 0; i < args.size(); i++) { - StringPiece arg = args[i]; + const StringPiece& arg = args[i]; if (*(arg.data()) != '-') { // Continue parsing as the subcommand if the first argument matches one of the subcommands if (i == 0) { for (auto& subcommand : subcommands_) { - if (arg == subcommand->name_ || arg==subcommand->short_name_) { + if (arg == subcommand->name_ || (!subcommand->short_name_.empty() + && arg == subcommand->short_name_)) { return subcommand->Execute( - std::vector<android::StringPiece>(args.begin() + 1, args.end()), out_error); + std::vector<StringPiece>(args.begin() + 1, args.end()), out_error); } } for (auto& subcommand : experimental_subcommands_) { - if (arg == subcommand->name_ || arg==subcommand->short_name_) { + if (arg == subcommand->name_ || (!subcommand->short_name_.empty() + && arg == subcommand->short_name_)) { return subcommand->Execute( - std::vector<android::StringPiece>(args.begin() + 1, args.end()), out_error); + std::vector<StringPiece>(args.begin() + 1, args.end()), out_error); } } } - file_args.push_back(arg.to_string()); + file_args.push_back(GetSafePath(arg)); continue; } @@ -205,7 +224,7 @@ int Command::Execute(const std::vector<android::StringPiece>& args, std::ostream } else { flag.action({}); } - flag.parsed = true; + flag.found = true; match = true; break; } @@ -219,7 +238,7 @@ int Command::Execute(const std::vector<android::StringPiece>& args, std::ostream } for (const Flag& flag : flags_) { - if (flag.required && !flag.parsed) { + if (flag.is_required && !flag.found) { *out_error << "missing required flag " << flag.name << "\n\n"; Usage(out_error); return 1; diff --git a/tools/aapt2/cmd/Command.h b/tools/aapt2/cmd/Command.h index 16949883d123..d21571d530d2 100644 --- a/tools/aapt2/cmd/Command.h +++ b/tools/aapt2/cmd/Command.h @@ -32,55 +32,83 @@ namespace aapt { class Command { public: explicit Command(const android::StringPiece& name) : name_(name.to_string()), - fullname_(name.to_string()) { } + short_name_(""), + full_subcommand_name_(name.to_string()) {} + explicit Command(const android::StringPiece& name, const android::StringPiece& short_name) - : name_(name.to_string()), short_name_(short_name.to_string()), fullname_(name.to_string()) {} + : name_(name.to_string()), short_name_(short_name.to_string()), + full_subcommand_name_(name.to_string()) {} + virtual ~Command() = default; + // Behavior flags used with the following functions that change how the command flags are parsed + // displayed. + enum : uint32_t { + // Indicates the arguments are file or folder paths. On Windows, paths that exceed the maximum + // path length will be converted to use the extended path prefix '//?/'. Without this + // conversion, files with long paths cannot be opened. + kPath = 1 << 0, + }; + void AddRequiredFlag(const android::StringPiece& name, const android::StringPiece& description, - std::string* value); - void AddRequiredFlagList(const android::StringPiece& name, const android::StringPiece& - description, std::vector<std::string>* value); + std::string* value, uint32_t flags = 0); + + void AddRequiredFlagList(const android::StringPiece& name, + const android::StringPiece& description, std::vector<std::string>* value, + uint32_t flags = 0); + void AddOptionalFlag(const android::StringPiece& name, const android::StringPiece& description, - Maybe<std::string>* value); + Maybe<std::string>* value, uint32_t flags = 0); + void AddOptionalFlagList(const android::StringPiece& name, - const android::StringPiece& description, std::vector<std::string>* value); + const android::StringPiece& description, std::vector<std::string>* value, + uint32_t flags = 0); + void AddOptionalFlagList(const android::StringPiece& name, - const android::StringPiece& description, std::unordered_set<std::string>* value); + const android::StringPiece& description, + std::unordered_set<std::string>* value); + void AddOptionalSwitch(const android::StringPiece& name, const android::StringPiece& description, - bool* value); + bool* value); + void AddOptionalSubcommand(std::unique_ptr<Command>&& subcommand, bool experimental = false); void SetDescription(const android::StringPiece& name); - /** Prints the help menu of the command. */ + // Prints the help menu of the command. void Usage(std::ostream* out); - /** - * Parses the command line arguments, sets the flag variable values, and runs the action of - * the command. If the arguments fail to parse to the command and its subcommands, then the action - * will not be run and the usage will be printed instead. - **/ + // Parses the command line arguments, sets the flag variable values, and runs the action of + // the command. If the arguments fail to parse to the command and its subcommands, then the action + // will not be run and the usage will be printed instead. int Execute(const std::vector<android::StringPiece>& args, std::ostream* outError); - /** The action to preform when the command is executed. */ + // The action to preform when the command is executed. virtual int Action(const std::vector<std::string>& args) = 0; private: - struct Flag { - std::string name; - std::string description; - std::function<bool(const android::StringPiece& value)> action; - bool required; - size_t num_args; + DISALLOW_COPY_AND_ASSIGN(Command); - bool parsed; + struct Flag { + explicit Flag(const android::StringPiece& name, const android::StringPiece& description, + const bool is_required, const size_t num_args, + std::function<bool(const android::StringPiece& value)>&& action) + : name(name.to_string()), description(description.to_string()), is_required(is_required), + num_args(num_args), action(std::move(action)) {} + + const std::string name; + const std::string description; + const bool is_required; + const size_t num_args; + const std::function<bool(const android::StringPiece& value)> action; + bool found = false; }; - std::string description_; - std::string name_; - std::string short_name_; - std::string fullname_; + const std::string name_; + const std::string short_name_; + std::string description_ = ""; + std::string full_subcommand_name_; + std::vector<Flag> flags_; std::vector<std::unique_ptr<Command>> subcommands_; std::vector<std::unique_ptr<Command>> experimental_subcommands_; diff --git a/tools/aapt2/cmd/Command_test.cpp b/tools/aapt2/cmd/Command_test.cpp new file mode 100644 index 000000000000..65608fdf64a7 --- /dev/null +++ b/tools/aapt2/cmd/Command_test.cpp @@ -0,0 +1,97 @@ +/* + * 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. + */ + +#include "Command.h" + +#include "test/Test.h" + +using ::testing::Eq; + +namespace aapt { + +class TestCommand : public Command { + public: + explicit TestCommand() : Command("command") {} + int Action(const std::vector<std::string>& args) override { + args_ = args; + return 0; + } + + std::vector<std::string> args_; +}; + +#ifdef _WIN32 +TEST(CommandTest, LongFullyQualifiedPathWindows) { + TestCommand command; + std::string required_flag; + command.AddRequiredFlag("--rflag", "", &required_flag, Command::kPath); + Maybe<std::string> optional_flag; + command.AddOptionalFlag("--oflag", "", &optional_flag, Command::kPath); + std::vector<std::string> required_flag_list; + command.AddRequiredFlagList("--rlflag", "", &required_flag_list, Command::kPath); + std::vector<std::string> optional_flag_list; + command.AddOptionalFlagList("--olflag", "", &optional_flag_list, Command::kPath); + std::string non_path_flag; + command.AddRequiredFlag("--nflag", "", &non_path_flag); + + const std::string kLongPath = + "C:\\Users\\jedo\\_bazel_jedo\\vcmdctjv\\execroot\\__main__\\_tmp" + "\\6767b4778f8798efc0f784ee74fa70ee\\tests\\testApksAr8c7560a9a65" + "\\1346ee7c014a089fb55d8c46cf3d9\\project\\baseModule\\build" + "\\intermediates\\processed_res\\minified\\processMinifiedResources" + "\\1346ee7c014a089fb55d8c46cf3d9\\project\\baseModule\\build" + "\\intermediates\\processed_res\\minified\\processMinifiedResources" + "\\out\\resources-minified.ap_"; + + const std::string kExpected = + "\\\\?\\C:\\Users\\jedo\\_bazel_jedo\\vcmdctjv\\execroot\\__main__\\_tmp" + "\\6767b4778f8798efc0f784ee74fa70ee\\tests\\testApksAr8c7560a9a65" + "\\1346ee7c014a089fb55d8c46cf3d9\\project\\baseModule\\build" + "\\intermediates\\processed_res\\minified\\processMinifiedResources" + "\\1346ee7c014a089fb55d8c46cf3d9\\project\\baseModule\\build" + "\\intermediates\\processed_res\\minified\\processMinifiedResources" + "\\out\\resources-minified.ap_"; + + + ASSERT_THAT(command.Execute({"--rflag", kLongPath, + "--oflag", kLongPath, + "--rlflag", kLongPath, + "--rlflag", kLongPath, + "--olflag", kLongPath, + "--olflag", kLongPath, + "--nflag", kLongPath, + kLongPath, kLongPath}, &std::cerr), Eq(0)); + + ASSERT_THAT(required_flag, Eq(kExpected)); + ASSERT_THAT(optional_flag, Eq(kExpected)); + ASSERT_THAT(required_flag_list.size(), Eq(2)); + ASSERT_THAT(required_flag_list[0], Eq(kExpected)); + ASSERT_THAT(required_flag_list[1], Eq(kExpected)); + ASSERT_THAT(optional_flag_list.size(), Eq(2)); + ASSERT_THAT(optional_flag_list[0], Eq(kExpected)); + ASSERT_THAT(optional_flag_list[1], Eq(kExpected)); + + // File arguments should also be converted to use the long path prefix + ASSERT_THAT(command.args_.size(), Eq(2)); + ASSERT_THAT(command.args_[0], Eq(kExpected)); + ASSERT_THAT(command.args_[1], Eq(kExpected)); + + // Do not convert flags that are not marged as paths + ASSERT_THAT(non_path_flag, Eq(kLongPath)); +} +#endif + +} // namespace aapt
\ No newline at end of file diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp index f63a0745690b..52375a39b93f 100644 --- a/tools/aapt2/cmd/Compile.cpp +++ b/tools/aapt2/cmd/Compile.cpp @@ -584,7 +584,7 @@ static bool CompileFile(IAaptContext* context, const CompileOptions& options, class CompileContext : public IAaptContext { public: - CompileContext(IDiagnostics* diagnostics) : diagnostics_(diagnostics) { + explicit CompileContext(IDiagnostics* diagnostics) : diagnostics_(diagnostics) { } PackageType GetPackageType() override { diff --git a/tools/aapt2/cmd/Compile.h b/tools/aapt2/cmd/Compile.h index c429d5f5d4b2..9b32cb3750a5 100644 --- a/tools/aapt2/cmd/Compile.h +++ b/tools/aapt2/cmd/Compile.h @@ -44,13 +44,13 @@ class CompileCommand : public Command { explicit CompileCommand(IDiagnostics* diagnostic) : Command("compile", "c"), diagnostic_(diagnostic) { SetDescription("Compiles resources to be linked into an apk."); - AddRequiredFlag("-o", "Output path", &options_.output_path); - AddOptionalFlag("--dir", "Directory to scan for resources", &options_.res_dir); + AddRequiredFlag("-o", "Output path", &options_.output_path, Command::kPath); + AddOptionalFlag("--dir", "Directory to scan for resources", &options_.res_dir, Command::kPath); AddOptionalFlag("--zip", "Zip file containing the res directory to scan for resources", - &options_.res_zip); + &options_.res_zip, Command::kPath); AddOptionalFlag("--output-text-symbols", "Generates a text file containing the resource symbols in the\n" - "specified file", &options_.generate_text_symbols_path); + "specified file", &options_.generate_text_symbols_path, Command::kPath); AddOptionalSwitch("--pseudo-localize", "Generate resources for pseudo-locales " "(en-XA and ar-XB)", &options_.pseudolocalize); AddOptionalSwitch("--no-crunch", "Disables PNG processing", &options_.no_png_crunch); @@ -70,8 +70,9 @@ class CompileCommand : public Command { Maybe<std::string> visibility_; }; -int Compile(IAaptContext* context, io::IFileCollection* inputs, - IArchiveWriter* output_writer, CompileOptions& options); +int Compile(IAaptContext* context, io::IFileCollection* inputs, IArchiveWriter* output_writer, + CompileOptions& options); + }// namespace aapt #endif //AAPT2_COMPILE_H diff --git a/tools/aapt2/cmd/Convert.cpp b/tools/aapt2/cmd/Convert.cpp index 4492f6b49cf0..85f90806752f 100644 --- a/tools/aapt2/cmd/Convert.cpp +++ b/tools/aapt2/cmd/Convert.cpp @@ -60,16 +60,17 @@ class IApkSerializer { class BinaryApkSerializer : public IApkSerializer { public: BinaryApkSerializer(IAaptContext* context, const Source& source, - const TableFlattenerOptions& options) - : IApkSerializer(context, source), tableFlattenerOptions_(options) {} + const TableFlattenerOptions& table_flattener_options, + const XmlFlattenerOptions& xml_flattener_options) + : IApkSerializer(context, source), + table_flattener_options_(table_flattener_options), + xml_flattener_options_(xml_flattener_options) {} bool SerializeXml(const xml::XmlResource* xml, const std::string& path, bool utf16, IArchiveWriter* writer, uint32_t compression_flags) override { BigBuffer buffer(4096); - XmlFlattenerOptions options = {}; - options.use_utf16 = utf16; - options.keep_raw_values = true; - XmlFlattener flattener(&buffer, options); + xml_flattener_options_.use_utf16 = utf16; + XmlFlattener flattener(&buffer, xml_flattener_options_); if (!flattener.Consume(context_, xml)) { return false; } @@ -80,7 +81,7 @@ class BinaryApkSerializer : public IApkSerializer { bool SerializeTable(ResourceTable* table, IArchiveWriter* writer) override { BigBuffer buffer(4096); - TableFlattener table_flattener(tableFlattenerOptions_, &buffer); + TableFlattener table_flattener(table_flattener_options_, &buffer); if (!table_flattener.Consume(context_, table)) { return false; } @@ -136,7 +137,8 @@ class BinaryApkSerializer : public IApkSerializer { } private: - TableFlattenerOptions tableFlattenerOptions_; + TableFlattenerOptions table_flattener_options_; + XmlFlattenerOptions xml_flattener_options_; DISALLOW_COPY_AND_ASSIGN(BinaryApkSerializer); }; @@ -252,13 +254,15 @@ class Context : public IAaptContext { }; int Convert(IAaptContext* context, LoadedApk* apk, IArchiveWriter* output_writer, - ApkFormat output_format, TableFlattenerOptions& options) { + ApkFormat output_format, TableFlattenerOptions table_flattener_options, + XmlFlattenerOptions xml_flattener_options) { // Do not change the ordering of strings in the values string pool - options.sort_stringpool_entries = false; + table_flattener_options.sort_stringpool_entries = false; unique_ptr<IApkSerializer> serializer; if (output_format == ApkFormat::kBinary) { - serializer.reset(new BinaryApkSerializer(context, apk->GetSource(), options)); + serializer.reset(new BinaryApkSerializer(context, apk->GetSource(), table_flattener_options, + xml_flattener_options)); } else if (output_format == ApkFormat::kProto) { serializer.reset(new ProtoApkSerializer(context, apk->GetSource())); } else { @@ -378,7 +382,8 @@ int ConvertCommand::Action(const std::vector<std::string>& args) { return 1; } - return Convert(&context, apk.get(), writer.get(), format, options_); + return Convert(&context, apk.get(), writer.get(), format, table_flattener_options_, + xml_flattener_options_); } } // namespace aapt diff --git a/tools/aapt2/cmd/Convert.h b/tools/aapt2/cmd/Convert.h index 6a6719c91b58..7e2029dfc4d2 100644 --- a/tools/aapt2/cmd/Convert.h +++ b/tools/aapt2/cmd/Convert.h @@ -20,6 +20,7 @@ #include "Command.h" #include "LoadedApk.h" #include "format/binary/TableFlattener.h" +#include "format/binary/XmlFlattener.h" namespace aapt { @@ -27,14 +28,18 @@ class ConvertCommand : public Command { public: explicit ConvertCommand() : Command("convert") { SetDescription("Converts an apk between binary and proto formats."); - AddRequiredFlag("-o", "Output path", &output_path_); + AddRequiredFlag("-o", "Output path", &output_path_, Command::kPath); AddOptionalFlag("--output-format", android::base::StringPrintf("Format of the output. " "Accepted values are '%s' and '%s'. When not set, defaults to '%s'.", kOutputFormatProto, kOutputFormatBinary, kOutputFormatBinary), &output_format_); AddOptionalSwitch("--enable-sparse-encoding", "Enables encoding sparse entries using a binary search tree.\n" - "This decreases APK size at the cost of resource retrieval performance.", - &options_.use_sparse_entries); + "This decreases APK size at the cost of resource retrieval performance.", + &table_flattener_options_.use_sparse_entries); + AddOptionalSwitch("--keep-raw-values", + android::base::StringPrintf("Preserve raw attribute values in xml files when using the" + " '%s' output format", kOutputFormatBinary), + &xml_flattener_options_.keep_raw_values); AddOptionalSwitch("-v", "Enables verbose logging", &verbose_); } @@ -44,14 +49,16 @@ class ConvertCommand : public Command { const static char* kOutputFormatProto; const static char* kOutputFormatBinary; - TableFlattenerOptions options_; + TableFlattenerOptions table_flattener_options_; + XmlFlattenerOptions xml_flattener_options_; std::string output_path_; Maybe<std::string> output_format_; bool verbose_ = false; }; int Convert(IAaptContext* context, LoadedApk* input, IArchiveWriter* output_writer, - ApkFormat output_format, TableFlattenerOptions& options); + ApkFormat output_format,TableFlattenerOptions table_flattener_options, + XmlFlattenerOptions xml_flattener_options); } // namespace aapt diff --git a/tools/aapt2/cmd/Convert_test.cpp b/tools/aapt2/cmd/Convert_test.cpp new file mode 100644 index 000000000000..2e4315086105 --- /dev/null +++ b/tools/aapt2/cmd/Convert_test.cpp @@ -0,0 +1,98 @@ +/* + * 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. + */ + +#include "Convert.h" + +#include "LoadedApk.h" +#include "test/Test.h" + +using testing::Eq; +using testing::Ne; + +namespace aapt { + +using ConvertTest = CommandTestFixture; + +TEST_F(ConvertTest, RemoveRawXmlStrings) { + StdErrDiagnostics diag; + const std::string compiled_files_dir = GetTestPath("compiled"); + ASSERT_TRUE(CompileFile(GetTestPath("res/xml/test.xml"), R"(<Item AgentCode="007"/>)", + compiled_files_dir, &diag)); + + const std::string out_apk = GetTestPath("out.apk"); + std::vector<std::string> link_args = { + "--manifest", GetDefaultManifest(), + "-o", out_apk, + "--keep-raw-values", + "--proto-format" + }; + + ASSERT_TRUE(Link(link_args, compiled_files_dir, &diag)); + + const std::string out_convert_apk = GetTestPath("out_convert.apk"); + std::vector<android::StringPiece> convert_args = { + "-o", out_convert_apk, + "--output-format", "binary", + out_apk, + }; + ASSERT_THAT(ConvertCommand().Execute(convert_args, &std::cerr), Eq(0)); + + // Load the binary xml tree + android::ResXMLTree tree; + std::unique_ptr<LoadedApk> apk = LoadedApk::LoadApkFromPath(out_convert_apk, &diag); + AssertLoadXml(apk.get(), "res/xml/test.xml", &tree); + + // Check that the raw string index has not been assigned + EXPECT_THAT(tree.getAttributeValueStringID(0), Eq(-1)); +} + +TEST_F(ConvertTest, KeepRawXmlStrings) { + StdErrDiagnostics diag; + const std::string compiled_files_dir = GetTestPath("compiled"); + ASSERT_TRUE(CompileFile(GetTestPath("res/xml/test.xml"), R"(<Item AgentCode="007"/>)", + compiled_files_dir, &diag)); + + const std::string out_apk = GetTestPath("out.apk"); + std::vector<std::string> link_args = { + "--manifest", GetDefaultManifest(), + "-o", out_apk, + "--keep-raw-values", + "--proto-format" + }; + + ASSERT_TRUE(Link(link_args, compiled_files_dir, &diag)); + + const std::string out_convert_apk = GetTestPath("out_convert.apk"); + std::vector<android::StringPiece> convert_args = { + "-o", out_convert_apk, + "--output-format", "binary", + "--keep-raw-values", + out_apk, + }; + ASSERT_THAT(ConvertCommand().Execute(convert_args, &std::cerr), Eq(0)); + + // Load the binary xml tree + android::ResXMLTree tree; + std::unique_ptr<LoadedApk> apk = LoadedApk::LoadApkFromPath(out_convert_apk, &diag); + AssertLoadXml(apk.get(), "res/xml/test.xml", &tree); + + // Check that the raw string index has been set to the correct string pool entry + int32_t raw_index = tree.getAttributeValueStringID(0); + ASSERT_THAT(raw_index, Ne(-1)); + EXPECT_THAT(util::GetString(tree.getStrings(), static_cast<size_t>(raw_index)), Eq("007")); +} + +} // namespace aapt
\ No newline at end of file diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 1b5601d451a7..729447ee1de5 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -78,7 +78,7 @@ namespace aapt { class LinkContext : public IAaptContext { public: - LinkContext(IDiagnostics* diagnostics) + explicit LinkContext(IDiagnostics* diagnostics) : diagnostics_(diagnostics), name_mangler_({}), symbols_(&name_mangler_) { } @@ -163,7 +163,7 @@ class LinkContext : public IAaptContext { // See b/37498913. class FeatureSplitSymbolTableDelegate : public DefaultSymbolTableDelegate { public: - FeatureSplitSymbolTableDelegate(IAaptContext* context) : context_(context) { + explicit FeatureSplitSymbolTableDelegate(IAaptContext* context) : context_(context) { } virtual ~FeatureSplitSymbolTableDelegate() = default; @@ -1545,7 +1545,8 @@ class Linker { // to the IArchiveWriter. bool WriteApk(IArchiveWriter* writer, proguard::KeepSet* keep_set, xml::XmlResource* manifest, ResourceTable* table) { - const bool keep_raw_values = context_->GetPackageType() == PackageType::kStaticLib; + const bool keep_raw_values = (context_->GetPackageType() == PackageType::kStaticLib) + || options_.keep_raw_values; bool result = FlattenXml(context_, *manifest, kAndroidManifestPath, keep_raw_values, true /*utf16*/, options_.output_format, writer); if (!result) { diff --git a/tools/aapt2/cmd/Link.h b/tools/aapt2/cmd/Link.h index 950dac204dde..f70470acb3d8 100644 --- a/tools/aapt2/cmd/Link.h +++ b/tools/aapt2/cmd/Link.h @@ -75,6 +75,7 @@ struct LinkOptions { // Flattening options. TableFlattenerOptions table_flattener_options; + bool keep_raw_values = false; // Split APK options. TableSplitterOptions table_splitter_options; @@ -100,24 +101,26 @@ class LinkCommand : public Command { explicit LinkCommand(IDiagnostics* diag) : Command("link", "l"), diag_(diag) { SetDescription("Links resources into an apk."); - AddRequiredFlag("-o", "Output path.", &options_.output_path); + AddRequiredFlag("-o", "Output path.", &options_.output_path, Command::kPath); AddRequiredFlag("--manifest", "Path to the Android manifest to build.", - &options_.manifest_path); - AddOptionalFlagList("-I", "Adds an Android APK to link against.", &options_.include_paths); + &options_.manifest_path, Command::kPath); + AddOptionalFlagList("-I", "Adds an Android APK to link against.", &options_.include_paths, + Command::kPath); AddOptionalFlagList("-A", "An assets directory to include in the APK. These are unprocessed.", - &options_.assets_dirs); + &options_.assets_dirs, Command::kPath); AddOptionalFlagList("-R", "Compilation unit to link, using `overlay` semantics.\n" - "The last conflicting resource given takes precedence.", &overlay_arg_list_); + "The last conflicting resource given takes precedence.", &overlay_arg_list_, + Command::kPath); AddOptionalFlag("--package-id", "Specify the package ID to use for this app. Must be greater or equal to\n" "0x7f and can't be used with --static-lib or --shared-lib.", &package_id_); AddOptionalFlag("--java", "Directory in which to generate R.java.", - &options_.generate_java_class_path); + &options_.generate_java_class_path, Command::kPath); AddOptionalFlag("--proguard", "Output file for generated Proguard rules.", - &options_.generate_proguard_rules_path); + &options_.generate_proguard_rules_path, Command::kPath); AddOptionalFlag("--proguard-main-dex", "Output file for generated Proguard rules for the main dex.", - &options_.generate_main_dex_proguard_rules_path); + &options_.generate_main_dex_proguard_rules_path, Command::kPath); AddOptionalSwitch("--proguard-conditional-keep-rules", "Generate conditional Proguard keep rules.", &options_.generate_conditional_proguard_rules); @@ -242,6 +245,8 @@ class LinkCommand : public Command { &options_.extensions_to_not_compress); AddOptionalSwitch("--no-compress", "Do not compress any resources.", &options_.do_not_compress_anything); + AddOptionalSwitch("--keep-raw-values", "Preserve raw attribute values in xml files.", + &options_.keep_raw_values); AddOptionalSwitch("--warn-manifest-validation", "Treat manifest validation errors as warnings.", &options_.manifest_fixer_options.warn_validation); @@ -250,7 +255,6 @@ class LinkCommand : public Command { "Syntax: path/to/output.apk:<config>[,<config>[...]].\n" "On Windows, use a semicolon ';' separator instead.", &split_args_); - AddOptionalSwitch("-v", "Enables verbose logging.", &verbose_); AddOptionalSwitch("--debug-mode", "Inserts android:debuggable=\"true\" in to the application node of the\n" "manifest, making the application debuggable even on production devices.", @@ -258,6 +262,7 @@ class LinkCommand : public Command { AddOptionalSwitch("--strict-visibility", "Do not allow overlays with different visibility levels.", &options_.strict_visibility); + AddOptionalSwitch("-v", "Enables verbose logging.", &verbose_); } int Action(const std::vector<std::string>& args) override; diff --git a/tools/aapt2/cmd/Link_test.cpp b/tools/aapt2/cmd/Link_test.cpp new file mode 100644 index 000000000000..3c8b72d3cb2c --- /dev/null +++ b/tools/aapt2/cmd/Link_test.cpp @@ -0,0 +1,78 @@ +/* + * 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. + */ + +#include "Link.h" + +#include "LoadedApk.h" +#include "test/Test.h" + +using testing::Eq; +using testing::Ne; + +namespace aapt { + +using LinkTest = CommandTestFixture; + +TEST_F(LinkTest, RemoveRawXmlStrings) { + StdErrDiagnostics diag; + const std::string compiled_files_dir = GetTestPath("compiled"); + ASSERT_TRUE(CompileFile(GetTestPath("res/xml/test.xml"), R"(<Item AgentCode="007"/>)", + compiled_files_dir, &diag)); + + const std::string out_apk = GetTestPath("out.apk"); + std::vector<std::string> link_args = { + "--manifest", GetDefaultManifest(), + "-o", out_apk, + }; + + ASSERT_TRUE(Link(link_args, compiled_files_dir, &diag)); + + // Load the binary xml tree + android::ResXMLTree tree; + std::unique_ptr<LoadedApk> apk = LoadedApk::LoadApkFromPath(out_apk, &diag); + AssertLoadXml(apk.get(), "res/xml/test.xml", &tree); + + // Check that the raw string index has not been assigned + EXPECT_THAT(tree.getAttributeValueStringID(0), Eq(-1)); +} + +TEST_F(LinkTest, KeepRawXmlStrings) { + StdErrDiagnostics diag; + const std::string compiled_files_dir = GetTestPath("compiled"); + ASSERT_TRUE(CompileFile(GetTestPath("res/xml/test.xml"), R"(<Item AgentCode="007"/>)", + compiled_files_dir, &diag)); + + const std::string out_apk = GetTestPath("out.apk"); + std::vector<std::string> link_args = { + "--manifest", GetDefaultManifest(), + "-o", out_apk, + "--keep-raw-values" + }; + + ASSERT_TRUE(Link(link_args, compiled_files_dir, &diag)); + + // Load the binary xml tree + android::ResXMLTree tree; + std::unique_ptr<LoadedApk> apk = LoadedApk::LoadApkFromPath(out_apk, &diag); + AssertLoadXml(apk.get(), "res/xml/test.xml", &tree); + + // Check that the raw string index has been set to the correct string pool entry + int32_t raw_index = tree.getAttributeValueStringID(0); + ASSERT_THAT(raw_index, Ne(-1)); + EXPECT_THAT(util::GetString(tree.getStrings(), static_cast<size_t>(raw_index)), Eq("007")); +} + +} // namespace aapt
\ No newline at end of file diff --git a/tools/aapt2/cmd/Optimize.h b/tools/aapt2/cmd/Optimize.h index 43bc216382fa..d07305bc3e04 100644 --- a/tools/aapt2/cmd/Optimize.h +++ b/tools/aapt2/cmd/Optimize.h @@ -61,9 +61,10 @@ class OptimizeCommand : public Command { public: explicit OptimizeCommand() : Command("optimize") { SetDescription("Preforms resource optimizations on an apk."); - AddOptionalFlag("-o", "Path to the output APK.", &options_.output_path); - AddOptionalFlag("-d", "Path to the output directory (for splits).", &options_.output_dir); - AddOptionalFlag("-x", "Path to XML configuration file.", &config_path_); + AddOptionalFlag("-o", "Path to the output APK.", &options_.output_path, Command::kPath); + AddOptionalFlag("-d", "Path to the output directory (for splits).", &options_.output_dir, + Command::kPath); + AddOptionalFlag("-x", "Path to XML configuration file.", &config_path_, Command::kPath); AddOptionalSwitch("-p", "Print the multi APK artifacts and exit.", &print_only_); AddOptionalFlag( "--target-densities", diff --git a/tools/aapt2/integration-tests/CommandTests/android-28.jar b/tools/aapt2/integration-tests/CommandTests/android-28.jar Binary files differnew file mode 100644 index 000000000000..ef7576d17c6d --- /dev/null +++ b/tools/aapt2/integration-tests/CommandTests/android-28.jar diff --git a/tools/aapt2/java/ProguardRules.h b/tools/aapt2/java/ProguardRules.h index 38b4860d1d61..f9656d112b7b 100644 --- a/tools/aapt2/java/ProguardRules.h +++ b/tools/aapt2/java/ProguardRules.h @@ -49,7 +49,7 @@ class KeepSet { public: KeepSet() = default; - KeepSet(bool conditional_keep_rules) : conditional_keep_rules_(conditional_keep_rules) { + explicit KeepSet(bool conditional_keep_rules) : conditional_keep_rules_(conditional_keep_rules) { } inline void AddManifestClass(const UsageLocation& file, const std::string& class_name) { diff --git a/tools/aapt2/link/XmlCompatVersioner.h b/tools/aapt2/link/XmlCompatVersioner.h index 099e23c9e479..998061806279 100644 --- a/tools/aapt2/link/XmlCompatVersioner.h +++ b/tools/aapt2/link/XmlCompatVersioner.h @@ -55,7 +55,7 @@ class XmlCompatVersioner { public: using Rules = std::unordered_map<ResourceId, std::unique_ptr<IDegradeRule>>; - XmlCompatVersioner(const Rules* rules); + explicit XmlCompatVersioner(const Rules* rules); std::vector<std::unique_ptr<xml::XmlResource>> Process(IAaptContext* context, xml::XmlResource* doc, @@ -83,7 +83,7 @@ struct ReplacementAttr { class DegradeToManyRule : public IDegradeRule { public: - DegradeToManyRule(std::vector<ReplacementAttr> attrs); + explicit DegradeToManyRule(std::vector<ReplacementAttr> attrs); virtual ~DegradeToManyRule() = default; std::vector<DegradeResult> Degrade(const xml::Element& src_el, const xml::Attribute& src_attr, diff --git a/tools/aapt2/process/SymbolTable.h b/tools/aapt2/process/SymbolTable.h index 51a2e373596a..2d8bd02a3799 100644 --- a/tools/aapt2/process/SymbolTable.h +++ b/tools/aapt2/process/SymbolTable.h @@ -71,7 +71,7 @@ class SymbolTable { bool is_dynamic = false; }; - SymbolTable(NameMangler* mangler); + explicit SymbolTable(NameMangler* mangler); // Overrides the default ISymbolTableDelegate, which allows a custom defined strategy for // looking up resources from a set of sources. diff --git a/tools/aapt2/test/Common.h b/tools/aapt2/test/Common.h index 50b41f1cb1e8..777ca5c72619 100644 --- a/tools/aapt2/test/Common.h +++ b/tools/aapt2/test/Common.h @@ -173,10 +173,12 @@ class ValueEqImpl : public ::testing::MatcherInterface<T> { template <typename TValue> class ValueEqMatcher { public: + // NOLINTNEXTLINE(google-explicit-constructor) ValueEqMatcher(TValue expected) : expected_(std::move(expected)) { } template <typename T> + // NOLINTNEXTLINE(google-explicit-constructor) operator ::testing::Matcher<T>() const { return ::testing::Matcher<T>(new ValueEqImpl<T>(&expected_)); } @@ -188,10 +190,12 @@ class ValueEqMatcher { template <typename TValue> class ValueEqPointerMatcher { public: + // NOLINTNEXTLINE(google-explicit-constructor) ValueEqPointerMatcher(const TValue* expected) : expected_(expected) { } template <typename T> + // NOLINTNEXTLINE(google-explicit-constructor) operator ::testing::Matcher<T>() const { return ::testing::Matcher<T>(new ValueEqImpl<T>(expected_)); } diff --git a/tools/aapt2/test/Fixture.cpp b/tools/aapt2/test/Fixture.cpp new file mode 100644 index 000000000000..aae79fafc0a6 --- /dev/null +++ b/tools/aapt2/test/Fixture.cpp @@ -0,0 +1,154 @@ +/* + * 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. + */ + +#include "test/Fixture.h" + +#include <dirent.h> + +#include "android-base/errors.h" +#include "android-base/file.h" +#include "android-base/stringprintf.h" +#include "android-base/utf8.h" +#include "androidfw/StringPiece.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + +#include "cmd/Compile.h" +#include "cmd/Link.h" +#include "io/FileStream.h" +#include "io/Util.h" +#include "util/Files.h" + +using testing::Eq; +using testing::Ne; + +namespace aapt { + +void ClearDirectory(const android::StringPiece& path) { + const std::string root_dir = path.to_string(); + std::unique_ptr<DIR, decltype(closedir)*> dir(opendir(root_dir.data()), closedir); + if (!dir) { + StdErrDiagnostics().Error(DiagMessage() << android::base::SystemErrorCodeToString(errno)); + return; + } + + while (struct dirent* entry = readdir(dir.get())) { + // Do not delete hidden files and do not recurse to the parent of this directory + if (util::StartsWith(entry->d_name, ".")) { + continue; + } + + std::string full_path = file::BuildPath({root_dir, entry->d_name}); + if (file::GetFileType(full_path) == file::FileType::kDirectory) { + ClearDirectory(full_path); +#ifdef _WIN32 + _rmdir(full_path.c_str()); +#else + rmdir(full_path.c_str()); +#endif + } else { + android::base::utf8::unlink(full_path.c_str()); + } + } +} + +void TestDirectoryFixture::SetUp() { + temp_dir_ = file::BuildPath({android::base::GetExecutableDirectory(), + "_temp", + testing::UnitTest::GetInstance()->current_test_case()->name(), + testing::UnitTest::GetInstance()->current_test_info()->name()}); + ASSERT_TRUE(file::mkdirs(temp_dir_)); + ClearDirectory(temp_dir_); +} + +void TestDirectoryFixture::TearDown() { + ClearDirectory(temp_dir_); +} + +bool TestDirectoryFixture::WriteFile(const std::string& path, const std::string& contents) { + CHECK(util::StartsWith(path, temp_dir_)) + << "Attempting to create a file outside of test temporary directory."; + + // Create any intermediate directories specified in the path + auto pos = std::find(path.rbegin(), path.rend(), file::sDirSep); + if (pos != path.rend()) { + std::string dirs = path.substr(0, (&*pos - path.data())); + file::mkdirs(dirs); + } + + return android::base::WriteStringToFile(contents, path); +} + +bool CommandTestFixture::CompileFile(const std::string& path, const std::string& contents, + const android::StringPiece& out_dir, IDiagnostics* diag) { + CHECK(WriteFile(path, contents)); + CHECK(file::mkdirs(out_dir.data())); + return CompileCommand(diag).Execute({path, "-o", out_dir, "-v"}, &std::cerr) == 0; +} + +bool CommandTestFixture::Link(const std::vector<std::string>& args, + const android::StringPiece& flat_dir, IDiagnostics* diag) { + std::vector<android::StringPiece> link_args; + for(const std::string& arg : args) { + link_args.emplace_back(arg); + } + + // Link against the android SDK + std::string android_sdk = file::BuildPath({android::base::GetExecutableDirectory(), + "integration-tests", "CommandTests", + "android-28.jar"}); + link_args.insert(link_args.end(), {"-I", android_sdk}); + + // Add the files from the compiled resources directory to the link file arguments + Maybe<std::vector<std::string>> compiled_files = file::FindFiles(flat_dir, diag); + if (compiled_files) { + for (std::string& compile_file : compiled_files.value()) { + compile_file = file::BuildPath({flat_dir, compile_file}); + link_args.emplace_back(std::move(compile_file)); + } + } + + return LinkCommand(diag).Execute(link_args, &std::cerr) == 0; +} + +std::string CommandTestFixture::GetDefaultManifest() { + const std::string manifest_file = GetTestPath("AndroidManifest.xml"); + CHECK(WriteFile(manifest_file, R"( + <manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.aapt.command.test"> + </manifest>)")); + return manifest_file; +} + +void CommandTestFixture::AssertLoadXml(LoadedApk *apk, const android::StringPiece &xml_path, + android::ResXMLTree *out_tree) { + ASSERT_THAT(apk, Ne(nullptr)); + + io::IFile* file = apk->GetFileCollection()->FindFile(xml_path); + ASSERT_THAT(file, Ne(nullptr)); + + std::unique_ptr<io::IData> data = file->OpenAsData(); + ASSERT_THAT(data, Ne(nullptr)); + + out_tree->setTo(data->data(), data->size()); + ASSERT_THAT(out_tree->getError(), Eq(android::OK)); + while (out_tree->next() != android::ResXMLTree::START_TAG) { + ASSERT_THAT(out_tree->getEventType(), Ne(android::ResXMLTree::BAD_DOCUMENT)); + ASSERT_THAT(out_tree->getEventType(), Ne(android::ResXMLTree::END_DOCUMENT)); + } +} + +} // namespace aapt
\ No newline at end of file diff --git a/tools/aapt2/test/Fixture.h b/tools/aapt2/test/Fixture.h new file mode 100644 index 000000000000..89d3b7b751a0 --- /dev/null +++ b/tools/aapt2/test/Fixture.h @@ -0,0 +1,96 @@ +/* + * 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. + */ + +#ifndef AAPT_TEST_FIXTURE_H +#define AAPT_TEST_FIXTURE_H + +#include "android-base/file.h" +#include "android-base/macros.h" +#include "androidfw/StringPiece.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + +#include "io/Util.h" +#include "util/Files.h" +#include "LoadedApk.h" + +namespace aapt { + +class TestDirectoryFixture : public ::testing::Test { + public: + TestDirectoryFixture() = default; + virtual ~TestDirectoryFixture() = default; + + // Creates the test directory or clears its contents if it contains previously created files. + void SetUp() override; + + // Clears the contents of the test directory. + void TearDown() override; + + // Retrieve the test directory of the fixture. + const android::StringPiece GetTestDirectory() { + return temp_dir_; + } + + // Retrieves the absolute path of the specified relative path in the test directory. Directories + // should be separated using forward slashes ('/'), and these slashes will be translated to + // backslashes when running Windows tests. + const std::string GetTestPath(const android::StringPiece& path) { + std::string base = temp_dir_; + for (android::StringPiece part : util::Split(path, '/')) { + file::AppendPath(&base, part); + } + return base; + } + + // Creates a file with the specified contents, creates any intermediate directories in the + // process. The file path must be an absolute path within the test directory. + bool WriteFile(const std::string& path, const std::string& contents); + + private: + std::string temp_dir_; + DISALLOW_COPY_AND_ASSIGN(TestDirectoryFixture); +}; + +class CommandTestFixture : public TestDirectoryFixture { + public: + CommandTestFixture() = default; + virtual ~CommandTestFixture() = default; + + // Wries the contents of the file to the specified path. The file is compiled and the flattened + // file is written to the out directory. + bool CompileFile(const std::string& path, const std::string& contents, + const android::StringPiece& flat_out_dir, IDiagnostics* diag); + + // Executes the link command with the specified arguments. The flattened files residing in the + // flat directory will be added to the link command as file arguments. + bool Link(const std::vector<std::string>& args, const android::StringPiece& flat_dir, + IDiagnostics* diag); + + // Creates a minimal android manifest within the test directory and returns the file path. + std::string GetDefaultManifest(); + + // Asserts that loading the tree from the specified file in the apk succeeds. + void AssertLoadXml(LoadedApk* apk, const android::StringPiece& xml_path, + android::ResXMLTree* out_tree); + + private: + DISALLOW_COPY_AND_ASSIGN(CommandTestFixture); +}; + +} // namespace aapt + +#endif // AAPT_TEST_FIXTURE_H
\ No newline at end of file diff --git a/tools/aapt2/test/Test.h b/tools/aapt2/test/Test.h index a24c01cd4137..7d96d1f08c0d 100644 --- a/tools/aapt2/test/Test.h +++ b/tools/aapt2/test/Test.h @@ -23,5 +23,6 @@ #include "test/Builders.h" #include "test/Common.h" #include "test/Context.h" +#include "test/Fixture.h" #endif // AAPT_TEST_TEST_H diff --git a/tools/aapt2/util/Files.cpp b/tools/aapt2/util/Files.cpp index 5cfbbf2485e0..7b268bb283f4 100644 --- a/tools/aapt2/util/Files.cpp +++ b/tools/aapt2/util/Files.cpp @@ -180,6 +180,17 @@ void AppendPath(std::string* base, StringPiece part) { base->append(part.data(), part.size()); } +std::string BuildPath(std::vector<const StringPiece>&& args) { + if (args.empty()) { + return ""; + } + std::string out = args[0].to_string(); + for (int i = 1; i < args.size(); i++) { + file::AppendPath(&out, args[i]); + } + return out; +} + std::string PackageToPath(const StringPiece& package) { std::string out_path; for (const StringPiece& part : util::Tokenize(package, '.')) { diff --git a/tools/aapt2/util/Files.h b/tools/aapt2/util/Files.h index 219e1a07af95..58395526b193 100644 --- a/tools/aapt2/util/Files.h +++ b/tools/aapt2/util/Files.h @@ -57,6 +57,9 @@ FileType GetFileType(const std::string& path); // Appends a path to `base`, separated by the directory separator. void AppendPath(std::string* base, android::StringPiece part); +// Concatenates the list of paths and separates each part with the directory separator. +std::string BuildPath(std::vector<const android::StringPiece>&& args); + // Makes all the directories in `path`. The last element in the path is interpreted as a directory. bool mkdirs(const std::string& path); diff --git a/tools/aapt2/util/Maybe.h b/tools/aapt2/util/Maybe.h index 031276c8b885..047e1a581330 100644 --- a/tools/aapt2/util/Maybe.h +++ b/tools/aapt2/util/Maybe.h @@ -44,12 +44,12 @@ class Maybe { Maybe(const Maybe& rhs); template <typename U> - Maybe(const Maybe<U>& rhs); // NOLINT(implicit) + Maybe(const Maybe<U>& rhs); // NOLINT(google-explicit-constructor) Maybe(Maybe&& rhs) noexcept; template <typename U> - Maybe(Maybe<U>&& rhs); // NOLINT(implicit) + Maybe(Maybe<U>&& rhs); // NOLINT(google-explicit-constructor) Maybe& operator=(const Maybe& rhs); @@ -64,12 +64,12 @@ class Maybe { /** * Construct a Maybe holding a value. */ - Maybe(const T& value); // NOLINT(implicit) + Maybe(const T& value); // NOLINT(google-explicit-constructor) /** * Construct a Maybe holding a value. */ - Maybe(T&& value); // NOLINT(implicit) + Maybe(T&& value); // NOLINT(google-explicit-constructor) /** * True if this holds a value, false if diff --git a/tools/apilint/apilint.py b/tools/apilint/apilint.py index 6476abd8268e..acf1f1e9902e 100644 --- a/tools/apilint/apilint.py +++ b/tools/apilint/apilint.py @@ -26,7 +26,7 @@ $ git blame api/current.txt -t -e > /tmp/currentblame.txt $ apilint.py /tmp/currentblame.txt previous.txt --no-color """ -import re, sys, collections, traceback, argparse +import re, sys, collections, traceback, argparse, itertools BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8) @@ -50,45 +50,37 @@ def format(fg=None, bg=None, bright=False, bold=False, dim=False, reset=False): return "\033[%sm" % (";".join(codes)) -def ident(raw): - """Strips superficial signature changes, giving us a strong key that - can be used to identify members across API levels.""" - raw = raw.replace(" deprecated ", " ") - raw = raw.replace(" synchronized ", " ") - raw = raw.replace(" final ", " ") - raw = re.sub("<.+?>", "", raw) - if " throws " in raw: - raw = raw[:raw.index(" throws ")] - return raw - - class Field(): - def __init__(self, clazz, line, raw, blame): + def __init__(self, clazz, line, raw, blame, sig_format = 1): self.clazz = clazz self.line = line self.raw = raw.strip(" {;") self.blame = blame - # drop generics for now; may need multiple passes - raw = re.sub("<[^<]+?>", "", raw) - raw = re.sub("<[^<]+?>", "", raw) + if sig_format == 2: + V2LineParser(raw).parse_into_field(self) + elif sig_format == 1: + # drop generics for now; may need multiple passes + raw = re.sub("<[^<]+?>", "", raw) + raw = re.sub("<[^<]+?>", "", raw) - raw = raw.split() - self.split = list(raw) + raw = raw.split() + self.split = list(raw) - for r in ["field", "volatile", "transient", "public", "protected", "static", "final", "deprecated"]: - while r in raw: raw.remove(r) + for r in ["field", "volatile", "transient", "public", "protected", "static", "final", "deprecated"]: + while r in raw: raw.remove(r) - # ignore annotations for now - raw = [ r for r in raw if not r.startswith("@") ] + # ignore annotations for now + raw = [ r for r in raw if not r.startswith("@") ] - self.typ = raw[0] - self.name = raw[1].strip(";") - if len(raw) >= 4 and raw[2] == "=": - self.value = raw[3].strip(';"') - else: - self.value = None - self.ident = ident(self.raw) + self.typ = raw[0] + self.name = raw[1].strip(";") + if len(raw) >= 4 and raw[2] == "=": + self.value = raw[3].strip(';"') + else: + self.value = None + + self.ident = "-".join((self.typ, self.name, self.value or "")) def __hash__(self): return hash(self.raw) @@ -96,48 +88,55 @@ class Field(): def __repr__(self): return self.raw - class Method(): - def __init__(self, clazz, line, raw, blame): + def __init__(self, clazz, line, raw, blame, sig_format = 1): self.clazz = clazz self.line = line self.raw = raw.strip(" {;") self.blame = blame - # drop generics for now; may need multiple passes - raw = re.sub("<[^<]+?>", "", raw) - raw = re.sub("<[^<]+?>", "", raw) - - # handle each clause differently - raw_prefix, raw_args, _, raw_throws = re.match(r"(.*?)\((.*?)\)( throws )?(.*?);$", raw).groups() - - # parse prefixes - raw = re.split("[\s]+", raw_prefix) - for r in ["", ";"]: - while r in raw: raw.remove(r) - self.split = list(raw) - - for r in ["method", "public", "protected", "static", "final", "deprecated", "abstract", "default", "operator"]: - while r in raw: raw.remove(r) - - self.typ = raw[0] - self.name = raw[1] - - # parse args - self.args = [] - for arg in re.split(",\s*", raw_args): - arg = re.split("\s", arg) - # ignore annotations for now - arg = [ a for a in arg if not a.startswith("@") ] - if len(arg[0]) > 0: - self.args.append(arg[0]) + if sig_format == 2: + V2LineParser(raw).parse_into_method(self) + elif sig_format == 1: + # drop generics for now; may need multiple passes + raw = re.sub("<[^<]+?>", "", raw) + raw = re.sub("<[^<]+?>", "", raw) + + # handle each clause differently + raw_prefix, raw_args, _, raw_throws = re.match(r"(.*?)\((.*?)\)( throws )?(.*?);$", raw).groups() + + # parse prefixes + raw = re.split("[\s]+", raw_prefix) + for r in ["", ";"]: + while r in raw: raw.remove(r) + self.split = list(raw) + + for r in ["method", "public", "protected", "static", "final", "deprecated", "abstract", "default", "operator", "synchronized"]: + while r in raw: raw.remove(r) + + self.typ = raw[0] + self.name = raw[1] + + # parse args + self.args = [] + for arg in re.split(",\s*", raw_args): + arg = re.split("\s", arg) + # ignore annotations for now + arg = [ a for a in arg if not a.startswith("@") ] + if len(arg[0]) > 0: + self.args.append(arg[0]) + + # parse throws + self.throws = [] + for throw in re.split(",\s*", raw_throws): + self.throws.append(throw) + else: + raise ValueError("Unknown signature format: " + sig_format) - # parse throws - self.throws = [] - for throw in re.split(",\s*", raw_throws): - self.throws.append(throw) + self.ident = "-".join((self.typ, self.name, "-".join(self.args))) - self.ident = ident(self.raw) + def sig_matches(self, typ, name, args): + return typ == self.typ and name == self.name and args == self.args def __hash__(self): return hash(self.raw) @@ -147,7 +146,7 @@ class Method(): class Class(): - def __init__(self, pkg, line, raw, blame): + def __init__(self, pkg, line, raw, blame, sig_format = 1): self.pkg = pkg self.line = line self.raw = raw.strip(" {;") @@ -156,31 +155,44 @@ class Class(): self.fields = [] self.methods = [] - # drop generics for now; may need multiple passes - raw = re.sub("<[^<]+?>", "", raw) - raw = re.sub("<[^<]+?>", "", raw) + if sig_format == 2: + V2LineParser(raw).parse_into_class(self) + elif sig_format == 1: + # drop generics for now; may need multiple passes + raw = re.sub("<[^<]+?>", "", raw) + raw = re.sub("<[^<]+?>", "", raw) + + raw = raw.split() + self.split = list(raw) + if "class" in raw: + self.fullname = raw[raw.index("class")+1] + elif "interface" in raw: + self.fullname = raw[raw.index("interface")+1] + elif "@interface" in raw: + self.fullname = raw[raw.index("@interface")+1] + else: + raise ValueError("Funky class type %s" % (self.raw)) - raw = raw.split() - self.split = list(raw) - if "class" in raw: - self.fullname = raw[raw.index("class")+1] - elif "interface" in raw: - self.fullname = raw[raw.index("interface")+1] - elif "@interface" in raw: - self.fullname = raw[raw.index("@interface")+1] - else: - raise ValueError("Funky class type %s" % (self.raw)) + if "extends" in raw: + self.extends = raw[raw.index("extends")+1] + else: + self.extends = None - if "extends" in raw: - self.extends = raw[raw.index("extends")+1] - self.extends_path = self.extends.split(".") + if "implements" in raw: + self.implements = raw[raw.index("implements")+1] + else: + self.implements = None else: - self.extends = None - self.extends_path = [] + raise ValueError("Unknown signature format: " + sig_format) self.fullname = self.pkg.name + "." + self.fullname self.fullname_path = self.fullname.split(".") + if self.extends is not None: + self.extends_path = self.extends.split(".") + else: + self.extends_path = [] + self.name = self.fullname[self.fullname.rindex(".")+1:] def merge_from(self, other): @@ -208,6 +220,318 @@ class Package(): def __repr__(self): return self.raw +class V2Tokenizer(object): + __slots__ = ["raw"] + + DELIMITER = re.compile(r'\s+|[()@<>;,={}/"!?]|\[\]|\.\.\.') + STRING_SPECIAL = re.compile(r'["\\]') + + def __init__(self, raw): + self.raw = raw + + def tokenize(self): + tokens = [] + current = 0 + raw = self.raw + length = len(raw) + + while current < length: + while current < length: + start = current + match = V2Tokenizer.DELIMITER.search(raw, start) + if match is not None: + match_start = match.start() + if match_start == current: + end = match.end() + else: + end = match_start + else: + end = length + + token = raw[start:end] + current = end + + if token == "" or token[0] == " ": + continue + else: + break + + if token == "@": + if raw[start:start+11] == "@interface ": + current = start + 11 + tokens.append("@interface") + continue + elif token == '/': + if raw[start:start+2] == "//": + current = length + continue + elif token == '"': + current, string_token = self.tokenize_string(raw, length, current) + tokens.append(token + string_token) + continue + + tokens.append(token) + + return tokens + + def tokenize_string(self, raw, length, current): + start = current + end = length + while start < end: + match = V2Tokenizer.STRING_SPECIAL.search(raw, start) + if match: + if match.group() == '"': + end = match.end() + break + elif match.group() == '\\': + # ignore whatever is after the slash + start += 2 + else: + raise ValueError("Unexpected match: `%s`" % (match.group())) + else: + raise ValueError("Unexpected EOF tokenizing string: `%s`" % (raw[current - 1:],)) + + token = raw[current:end] + return end, token + +class V2LineParser(object): + __slots__ = ["tokenized", "current", "len"] + + MODIFIERS = set("public protected internal private abstract default static final transient volatile synchronized".split()) + JAVA_LANG_TYPES = set("AbstractMethodError AbstractStringBuilder Appendable ArithmeticException ArrayIndexOutOfBoundsException ArrayStoreException AssertionError AutoCloseable Boolean BootstrapMethodError Byte Character CharSequence Class ClassCastException ClassCircularityError ClassFormatError ClassLoader ClassNotFoundException Cloneable CloneNotSupportedException Comparable Compiler Deprecated Double Enum EnumConstantNotPresentException Error Exception ExceptionInInitializerError Float FunctionalInterface IllegalAccessError IllegalAccessException IllegalArgumentException IllegalMonitorStateException IllegalStateException IllegalThreadStateException IncompatibleClassChangeError IndexOutOfBoundsException InheritableThreadLocal InstantiationError InstantiationException Integer InternalError InterruptedException Iterable LinkageError Long Math NegativeArraySizeException NoClassDefFoundError NoSuchFieldError NoSuchFieldException NoSuchMethodError NoSuchMethodException NullPointerException Number NumberFormatException Object OutOfMemoryError Override Package package-info.java Process ProcessBuilder ProcessEnvironment ProcessImpl Readable ReflectiveOperationException Runnable Runtime RuntimeException RuntimePermission SafeVarargs SecurityException SecurityManager Short StackOverflowError StackTraceElement StrictMath String StringBuffer StringBuilder StringIndexOutOfBoundsException SuppressWarnings System Thread ThreadDeath ThreadGroup ThreadLocal Throwable TypeNotPresentException UNIXProcess UnknownError UnsatisfiedLinkError UnsupportedClassVersionError UnsupportedOperationException VerifyError VirtualMachineError Void".split()) + + def __init__(self, raw): + self.tokenized = V2Tokenizer(raw).tokenize() + self.current = 0 + self.len = len(self.tokenized) + + def parse_into_method(self, method): + method.split = [] + kind = self.parse_one_of("ctor", "method") + method.split.append(kind) + annotations = self.parse_annotations() + method.split.extend(self.parse_modifiers()) + self.parse_matching_paren("<", ">") + if "@Deprecated" in annotations: + method.split.append("deprecated") + if kind == "ctor": + method.typ = "ctor" + else: + method.typ = self.parse_type() + method.split.append(method.typ) + method.name = self.parse_name() + method.split.append(method.name) + self.parse_token("(") + method.args = self.parse_args() + self.parse_token(")") + method.throws = self.parse_throws() + if "@interface" in method.clazz.split: + self.parse_annotation_default() + self.parse_token(";") + self.parse_eof() + + def parse_into_class(self, clazz): + clazz.split = [] + annotations = self.parse_annotations() + if "@Deprecated" in annotations: + clazz.split.append("deprecated") + clazz.split.extend(self.parse_modifiers()) + kind = self.parse_one_of("class", "interface", "@interface", "enum") + if kind == "enum": + # enums are implicitly final + clazz.split.append("final") + clazz.split.append(kind) + clazz.fullname = self.parse_name() + self.parse_matching_paren("<", ">") + extends = self.parse_extends() + clazz.extends = extends[0] if extends else None + implements = self.parse_implements() + clazz.implements = implements[0] if implements else None + # The checks assume that interfaces are always found in implements, which isn't true for + # subinterfaces. + if not implements and "interface" in clazz.split: + clazz.implements = clazz.extends + self.parse_token("{") + self.parse_eof() + + def parse_into_field(self, field): + kind = self.parse_token("field") + field.split = [kind] + annotations = self.parse_annotations() + if "@Deprecated" in annotations: + field.split.append("deprecated") + field.split.extend(self.parse_modifiers()) + field.typ = self.parse_type() + field.split.append(field.typ) + field.name = self.parse_name() + field.split.append(field.name) + if self.parse_if("="): + field.value = self.parse_value_stripped() + else: + field.value = None + + self.parse_token(";") + self.parse_eof() + + def lookahead(self): + return self.tokenized[self.current] + + def parse_one_of(self, *options): + found = self.lookahead() + if found not in options: + raise ValueError("Parsing failed, expected one of `%s` but found `%s` in %s" % (options, found, repr(self.tokenized))) + return self.parse_token() + + def parse_token(self, tok = None): + found = self.lookahead() + if tok is not None and found != tok: + raise ValueError("Parsing failed, expected `%s` but found `%s` in %s" % (tok, found, repr(self.tokenized))) + self.current += 1 + return found + + def eof(self): + return self.current == self.len + + def parse_eof(self): + if not self.eof(): + raise ValueError("Parsing failed, expected EOF, but %s has not been parsed in %s" % (self.tokenized[self.current:], self.tokenized)) + + def parse_if(self, tok): + if not self.eof() and self.lookahead() == tok: + self.parse_token() + return True + return False + + def parse_annotations(self): + ret = [] + while self.lookahead() == "@": + ret.append(self.parse_annotation()) + return ret + + def parse_annotation(self): + ret = self.parse_token("@") + self.parse_token() + self.parse_matching_paren("(", ")") + return ret + + def parse_matching_paren(self, open, close): + start = self.current + if not self.parse_if(open): + return + length = len(self.tokenized) + count = 1 + while count > 0: + if self.current == length: + raise ValueError("Unexpected EOF looking for closing paren: `%s`" % (self.tokenized[start:],)) + t = self.parse_token() + if t == open: + count += 1 + elif t == close: + count -= 1 + return self.tokenized[start:self.current] + + def parse_modifiers(self): + ret = [] + while self.lookahead() in V2LineParser.MODIFIERS: + ret.append(self.parse_token()) + return ret + + def parse_kotlin_nullability(self): + t = self.lookahead() + if t == "?" or t == "!": + return self.parse_token() + return None + + def parse_type(self): + type = self.parse_token() + if type in V2LineParser.JAVA_LANG_TYPES: + type = "java.lang." + type + self.parse_matching_paren("<", ">") + while True: + t = self.lookahead() + if t == "[]": + type += self.parse_token() + elif self.parse_kotlin_nullability() is not None: + pass # discard nullability for now + else: + break + return type + + def parse_arg_type(self): + type = self.parse_type() + if self.parse_if("..."): + type += "..." + self.parse_kotlin_nullability() # discard nullability for now + return type + + def parse_name(self): + return self.parse_token() + + def parse_args(self): + args = [] + if self.lookahead() == ")": + return args + + while True: + args.append(self.parse_arg()) + if self.lookahead() == ")": + return args + self.parse_token(",") + + def parse_arg(self): + self.parse_annotations() + type = self.parse_arg_type() + l = self.lookahead() + if l != "," and l != ")": + self.parse_token() # kotlin argument name + if self.parse_if('='): # kotlin default value + (self.parse_matching_paren('(', ')') or + self.parse_matching_paren('{', '}') or + self.parse_token() and self.parse_matching_paren('(', ')')) + return type + + def parse_throws(self): + ret = [] + if self.parse_if("throws"): + ret.append(self.parse_type()) + while self.parse_if(","): + ret.append(self.parse_type()) + return ret + + def parse_extends(self): + if self.parse_if("extends"): + return self.parse_space_delimited_type_list() + return [] + + def parse_implements(self): + if self.parse_if("implements"): + return self.parse_space_delimited_type_list() + return [] + + def parse_space_delimited_type_list(self, terminals = ["implements", "{"]): + types = [] + while True: + types.append(self.parse_type()) + if self.lookahead() in terminals: + return types + + def parse_annotation_default(self): + if self.parse_if("default"): + self.parse_value() + + def parse_value(self): + if self.lookahead() == "{": + return " ".join(self.parse_matching_paren("{", "}")) + elif self.lookahead() == "(": + return " ".join(self.parse_matching_paren("(", ")")) + else: + return self.parse_token() + + def parse_value_stripped(self): + value = self.parse_value() + if value[0] == '"': + return value[1:-1] + return value + def _parse_stream(f, clazz_cb=None, base_f=None, out_classes_with_base=None, in_classes_with_base=[]): @@ -252,6 +576,7 @@ def _parse_stream_to_generator(f): pkg = None clazz = None blame = None + sig_format = 1 re_blame = re.compile("^([a-z0-9]{7,}) \(<([^>]+)>.+?\) (.+?)$") for raw in f: @@ -264,16 +589,18 @@ def _parse_stream_to_generator(f): else: blame = None - if raw.startswith("package"): + if line == 1 and raw == "// Signature format: 2.0": + sig_format = 2 + elif raw.startswith("package"): pkg = Package(line, raw, blame) elif raw.startswith(" ") and raw.endswith("{"): - clazz = Class(pkg, line, raw, blame) + clazz = Class(pkg, line, raw, blame, sig_format=sig_format) elif raw.startswith(" ctor"): - clazz.ctors.append(Method(clazz, line, raw, blame)) + clazz.ctors.append(Method(clazz, line, raw, blame, sig_format=sig_format)) elif raw.startswith(" method"): - clazz.methods.append(Method(clazz, line, raw, blame)) + clazz.methods.append(Method(clazz, line, raw, blame, sig_format=sig_format)) elif raw.startswith(" field"): - clazz.fields.append(Field(clazz, line, raw, blame)) + clazz.fields.append(Field(clazz, line, raw, blame, sig_format=sig_format)) elif raw.startswith(" }") and clazz: yield clazz @@ -367,7 +694,7 @@ def _fail(clazz, detail, error, rule, msg): """Records an API failure to be processed later.""" global failures - sig = "%s-%s-%s" % (clazz.fullname, repr(detail), msg) + sig = "%s-%s-%s" % (clazz.fullname, detail.ident if detail else None, msg) sig = sig.replace(" deprecated ", " ") failures[sig] = Failure(sig, clazz, detail, error, rule, msg) @@ -408,7 +735,7 @@ def verify_constants(clazz): def verify_enums(clazz): """Enums are bad, mmkay?""" - if "extends java.lang.Enum" in clazz.raw: + if clazz.extends == "java.lang.Enum" or "enum" in clazz.split: error(clazz, None, "F5", "Enums are not allowed") @@ -467,7 +794,7 @@ def verify_listeners(clazz): interface OnFooListener { void onFoo() }""" if clazz.name.endswith("Listener"): - if " abstract class " in clazz.raw: + if "abstract" in clazz.split and "class" in clazz.split: error(clazz, None, "L1", "Listeners should be an interface, or otherwise renamed Callback") for m in clazz.methods: @@ -546,16 +873,16 @@ def verify_equals(clazz): eq = False hc = False for m in clazz.methods: - if " static " in m.raw: continue - if "boolean equals(java.lang.Object)" in m.raw: eq = True - if "int hashCode()" in m.raw: hc = True + if "static" in m.split: continue + if m.sig_matches("boolean", "equals", ["java.lang.Object"]): eq = True + if m.sig_matches("int", "hashCode", []): hc = True if eq != hc: error(clazz, None, "M8", "Must override both equals and hashCode; missing one") def verify_parcelable(clazz): """Verify that Parcelable objects aren't hiding required bits.""" - if "implements android.os.Parcelable" in clazz.raw: + if clazz.implements == "android.os.Parcelable": creator = [ i for i in clazz.fields if i.name == "CREATOR" ] write = [ i for i in clazz.methods if i.name == "writeToParcel" ] describe = [ i for i in clazz.methods if i.name == "describeContents" ] @@ -563,8 +890,7 @@ def verify_parcelable(clazz): if len(creator) == 0 or len(write) == 0 or len(describe) == 0: error(clazz, None, "FW3", "Parcelable requires CREATOR, writeToParcel, and describeContents; missing one") - if ((" final class " not in clazz.raw) and - (" final deprecated class " not in clazz.raw)): + if "final" not in clazz.split: error(clazz, None, "FW8", "Parcelable classes must be final") for c in clazz.ctors: @@ -684,7 +1010,7 @@ def verify_helper_classes(clazz): """Verify that helper classes are named consistently with what they extend. All developer extendable methods should be named onFoo().""" test_methods = False - if "extends android.app.Service" in clazz.raw: + if clazz.extends == "android.app.Service": test_methods = True if not clazz.name.endswith("Service"): error(clazz, None, "CL4", "Inconsistent class name; should be FooService") @@ -696,7 +1022,7 @@ def verify_helper_classes(clazz): if f.value != clazz.fullname: error(clazz, f, "C4", "Inconsistent interface constant; expected '%s'" % (clazz.fullname)) - if "extends android.content.ContentProvider" in clazz.raw: + if clazz.extends == "android.content.ContentProvider": test_methods = True if not clazz.name.endswith("Provider"): error(clazz, None, "CL4", "Inconsistent class name; should be FooProvider") @@ -708,12 +1034,12 @@ def verify_helper_classes(clazz): if f.value != clazz.fullname: error(clazz, f, "C4", "Inconsistent interface constant; expected '%s'" % (clazz.fullname)) - if "extends android.content.BroadcastReceiver" in clazz.raw: + if clazz.extends == "android.content.BroadcastReceiver": test_methods = True if not clazz.name.endswith("Receiver"): error(clazz, None, "CL4", "Inconsistent class name; should be FooReceiver") - if "extends android.app.Activity" in clazz.raw: + if clazz.extends == "android.app.Activity": test_methods = True if not clazz.name.endswith("Activity"): error(clazz, None, "CL4", "Inconsistent class name; should be FooActivity") @@ -731,7 +1057,7 @@ def verify_helper_classes(clazz): def verify_builder(clazz): """Verify builder classes. Methods should return the builder to enable chaining.""" - if " extends " in clazz.raw: return + if clazz.extends: return if not clazz.name.endswith("Builder"): return if clazz.name != "Builder": @@ -759,7 +1085,7 @@ def verify_builder(clazz): def verify_aidl(clazz): """Catch people exposing raw AIDL.""" - if "extends android.os.Binder" in clazz.raw or "implements android.os.IInterface" in clazz.raw: + if clazz.extends == "android.os.Binder" or clazz.implements == "android.os.IInterface": error(clazz, None, None, "Raw AIDL interfaces must not be exposed") @@ -768,48 +1094,66 @@ def verify_internal(clazz): if clazz.pkg.name.startswith("com.android"): error(clazz, None, None, "Internal classes must not be exposed") +def layering_build_ranking(ranking_list): + r = {} + for rank, ps in enumerate(ranking_list): + if not isinstance(ps, list): + ps = [ps] + for p in ps: + rs = r + for n in p.split('.'): + if n not in rs: + rs[n] = {} + rs = rs[n] + rs['-rank'] = rank + return r + +LAYERING_PACKAGE_RANKING = layering_build_ranking([ + ["android.service","android.accessibilityservice","android.inputmethodservice","android.printservice","android.appwidget","android.webkit","android.preference","android.gesture","android.print"], + "android.app", + "android.widget", + "android.view", + "android.animation", + "android.provider", + ["android.content","android.graphics.drawable"], + "android.database", + "android.text", + "android.graphics", + "android.os", + "android.util" +]) def verify_layering(clazz): """Catch package layering violations. For example, something in android.os depending on android.app.""" - ranking = [ - ["android.service","android.accessibilityservice","android.inputmethodservice","android.printservice","android.appwidget","android.webkit","android.preference","android.gesture","android.print"], - "android.app", - "android.widget", - "android.view", - "android.animation", - "android.provider", - ["android.content","android.graphics.drawable"], - "android.database", - "android.text", - "android.graphics", - "android.os", - "android.util" - ] def rank(p): - for i in range(len(ranking)): - if isinstance(ranking[i], list): - for j in ranking[i]: - if p.startswith(j): return i + r = None + l = LAYERING_PACKAGE_RANKING + for n in p.split('.'): + if n in l: + l = l[n] + if '-rank' in l: + r = l['-rank'] else: - if p.startswith(ranking[i]): return i + break + return r cr = rank(clazz.pkg.name) if cr is None: return for f in clazz.fields: ir = rank(f.typ) - if ir and ir < cr: + if ir is not None and ir < cr: warn(clazz, f, "FW6", "Field type violates package layering") - for m in clazz.methods: + for m in itertools.chain(clazz.methods, clazz.ctors): ir = rank(m.typ) - if ir and ir < cr: + if ir is not None and ir < cr: warn(clazz, m, "FW6", "Method return type violates package layering") for arg in m.args: ir = rank(arg) - if ir and ir < cr: + if ir is not None and ir < cr: warn(clazz, m, "FW6", "Method argument type violates package layering") @@ -900,21 +1244,18 @@ def verify_exception(clazz): if len(m.args) == 0 and t in ["java.lang.IllegalArgumentException", "java.lang.NullPointerException"]: warn(clazz, m, "S1", "Methods taking no arguments should throw IllegalStateException") +GOOGLE_IGNORECASE = re.compile("google", re.IGNORECASE) def verify_google(clazz): """Verifies that APIs never reference Google.""" - if re.search("google", clazz.raw, re.IGNORECASE): + if GOOGLE_IGNORECASE.search(clazz.raw) is not None: error(clazz, None, None, "Must never reference Google") - test = [] - test.extend(clazz.ctors) - test.extend(clazz.fields) - test.extend(clazz.methods) - - for t in test: - if re.search("google", t.raw, re.IGNORECASE): - error(clazz, t, None, "Must never reference Google") + for test in clazz.ctors, clazz.fields, clazz.methods: + for t in test: + if GOOGLE_IGNORECASE.search(t.raw) is not None: + error(clazz, t, None, "Must never reference Google") def verify_bitset(clazz): @@ -1168,7 +1509,7 @@ def verify_abstract_inner(clazz): """Verifies that abstract inner classes are static.""" if re.match(".+?\.[A-Z][^\.]+\.[A-Z]", clazz.fullname): - if " abstract " in clazz.raw and " static " not in clazz.raw: + if "abstract" in clazz.split and "static" not in clazz.split: warn(clazz, None, None, "Abstract inner classes should be static to improve testability") @@ -1263,8 +1604,8 @@ def verify_units(clazz): def verify_closable(clazz): """Verifies that classes are AutoClosable.""" - if "implements java.lang.AutoCloseable" in clazz.raw: return - if "implements java.io.Closeable" in clazz.raw: return + if clazz.implements == "java.lang.AutoCloseable": return + if clazz.implements == "java.io.Closeable": return for m in clazz.methods: if len(m.args) > 0: continue @@ -1350,6 +1691,9 @@ def verify_method_name_not_kotlin_operator(clazz): def verify_collections_over_arrays(clazz): """Warn that [] should be Collections.""" + if "@interface" in clazz.split: + return + safe = ["java.lang.String[]","byte[]","short[]","int[]","long[]","float[]","double[]","boolean[]","char[]"] for m in clazz.methods: if m.typ.endswith("[]") and m.typ not in safe: @@ -1683,11 +2027,11 @@ def show_deprecations_at_birth(cur, prev): del cur[prev_clazz.fullname] for clazz in cur.values(): - if " deprecated " in clazz.raw and not clazz.fullname in prev: + if "deprecated" in clazz.split and not clazz.fullname in prev: error(clazz, None, None, "Found API deprecation at birth") for i in clazz.ctors + clazz.methods + clazz.fields: - if " deprecated " in i.raw: + if "deprecated" in i.split: error(clazz, i, None, "Found API deprecation at birth") print "%s Deprecated at birth %s\n" % ((format(fg=WHITE, bg=BLUE, bold=True), diff --git a/tools/apilint/apilint_test.py b/tools/apilint/apilint_test.py index ece69a99f579..081e98defa17 100644 --- a/tools/apilint/apilint_test.py +++ b/tools/apilint/apilint_test.py @@ -143,5 +143,148 @@ class BaseFileTests(unittest.TestCase): out_classes_with_base=classes_with_base) self.assertEquals(map(lambda x: x.fullname, classes_with_base), ["android.app.WallpaperColors"]) +class V2TokenizerTests(unittest.TestCase): + def _test(self, raw, expected): + self.assertEquals(apilint.V2Tokenizer(raw).tokenize(), expected) + + def test_simple(self): + self._test(" method public some.Type someName(some.Argument arg, int arg);", + ['method', 'public', 'some.Type', 'someName', '(', 'some.Argument', + 'arg', ',', 'int', 'arg', ')', ';']) + self._test("class Some.Class extends SomeOther {", + ['class', 'Some.Class', 'extends', 'SomeOther', '{']) + + def test_varargs(self): + self._test("name(String...)", + ['name', '(', 'String', '...', ')']) + + def test_kotlin(self): + self._test("String? name(String!...)", + ['String', '?', 'name', '(', 'String', '!', '...', ')']) + + def test_annotation(self): + self._test("method @Nullable public void name();", + ['method', '@', 'Nullable', 'public', 'void', 'name', '(', ')', ';']) + + def test_annotation_args(self): + self._test("@Some(val=1, other=2) class Class {", + ['@', 'Some', '(', 'val', '=', '1', ',', 'other', '=', '2', ')', + 'class', 'Class', '{']) + def test_comment(self): + self._test("some //comment", ['some']) + + def test_strings(self): + self._test(r'"" "foo" "\"" "\\"', ['""', '"foo"', r'"\""', r'"\\"']) + + def test_at_interface(self): + self._test("public @interface Annotation {", + ['public', '@interface', 'Annotation', '{']) + + def test_array_type(self): + self._test("int[][]", ['int', '[]', '[]']) + + def test_generics(self): + self._test("<>foobar<A extends Object>", + ['<', '>', 'foobar', '<', 'A', 'extends', 'Object', '>']) + +class V2ParserTests(unittest.TestCase): + def _cls(self, raw): + pkg = apilint.Package(999, "package pkg {", None) + return apilint.Class(pkg, 1, raw, '', sig_format=2) + + def _method(self, raw, cls=None): + if not cls: + cls = self._cls("class Class {") + return apilint.Method(cls, 1, raw, '', sig_format=2) + + def _field(self, raw): + cls = self._cls("class Class {") + return apilint.Field(cls, 1, raw, '', sig_format=2) + + def test_class(self): + cls = self._cls("@Deprecated @IntRange(from=1, to=2) public static abstract class Some.Name extends Super<Class> implements Interface<Class> {") + self.assertTrue('deprecated' in cls.split) + self.assertTrue('static' in cls.split) + self.assertTrue('abstract' in cls.split) + self.assertTrue('class' in cls.split) + self.assertEquals('Super', cls.extends) + self.assertEquals('Interface', cls.implements) + self.assertEquals('pkg.Some.Name', cls.fullname) + + def test_interface(self): + cls = self._cls("@Deprecated @IntRange(from=1, to=2) public interface Some.Name extends Interface<Class> {") + self.assertTrue('deprecated' in cls.split) + self.assertTrue('interface' in cls.split) + self.assertEquals('Interface', cls.extends) + self.assertEquals('Interface', cls.implements) + self.assertEquals('pkg.Some.Name', cls.fullname) + + def test_at_interface(self): + cls = self._cls("@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.LOCAL_VARIABLE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface SuppressLint {") + self.assertTrue('@interface' in cls.split) + self.assertEquals('pkg.SuppressLint', cls.fullname) + + def test_parse_method(self): + m = self._method("method @Deprecated public static <T> Class<T>[][] name(" + + "Class<T[]>[][], Class<T[][][]>[][]...) throws Exception, T;") + self.assertTrue('static' in m.split) + self.assertTrue('public' in m.split) + self.assertTrue('method' in m.split) + self.assertTrue('deprecated' in m.split) + self.assertEquals('java.lang.Class[][]', m.typ) + self.assertEquals('name', m.name) + self.assertEquals(['java.lang.Class[][]', 'java.lang.Class[][]...'], m.args) + self.assertEquals(['java.lang.Exception', 'T'], m.throws) + + def test_ctor(self): + m = self._method("ctor @Deprecated <T> ClassName();") + self.assertTrue('ctor' in m.split) + self.assertTrue('deprecated' in m.split) + self.assertEquals('ctor', m.typ) + self.assertEquals('ClassName', m.name) + + def test_parse_annotation_method(self): + cls = self._cls("@interface Annotation {") + self._method('method abstract String category() default "";', cls=cls) + self._method('method abstract boolean deepExport() default false;', cls=cls) + self._method('method abstract ViewDebug.FlagToString[] flagMapping() default {};', cls=cls) + + def test_parse_string_field(self): + f = self._field('field @Deprecated public final String SOME_NAME = "value";') + self.assertTrue('field' in f.split) + self.assertTrue('deprecated' in f.split) + self.assertTrue('final' in f.split) + self.assertEquals('java.lang.String', f.typ) + self.assertEquals('SOME_NAME', f.name) + self.assertEquals('value', f.value) + + def test_parse_field(self): + f = self._field('field public Object SOME_NAME;') + self.assertTrue('field' in f.split) + self.assertEquals('java.lang.Object', f.typ) + self.assertEquals('SOME_NAME', f.name) + self.assertEquals(None, f.value) + + def test_parse_int_field(self): + f = self._field('field public int NAME = 123;') + self.assertTrue('field' in f.split) + self.assertEquals('int', f.typ) + self.assertEquals('NAME', f.name) + self.assertEquals('123', f.value) + + def test_parse_quotient_field(self): + f = self._field('field public int NAME = (0.0/0.0);') + self.assertTrue('field' in f.split) + self.assertEquals('int', f.typ) + self.assertEquals('NAME', f.name) + self.assertEquals('( 0.0 / 0.0 )', f.value) + + def test_kotlin_types(self): + self._field('field public List<Integer[]?[]!>?[]![]? NAME;') + self._method("method <T?> Class<T!>?[]![][]? name(Type!, Type argname," + + "Class<T?>[][]?[]!...!) throws Exception, T;") + self._method("method <T> T name(T a = 1, T b = A(1), Lambda f = { false }, N? n = null, " + + """double c = (1/0), float d = 1.0f, String s = "heyo", char c = 'a');""") + if __name__ == "__main__": - unittest.main()
\ No newline at end of file + unittest.main() diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 1700006f939d..7b2f07d5cb68 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -16,7 +16,6 @@ package android.net.wifi; - import android.content.pm.ParceledListSlice; import android.net.wifi.hotspot2.OsuProvider; @@ -63,7 +62,7 @@ interface IWifiManager ParceledListSlice getPrivilegedConfiguredNetworks(); - List<WifiConfiguration> getAllMatchingWifiConfigs(in List<ScanResult> scanResult); + Map getAllMatchingFqdnsForScanResults(in List<ScanResult> scanResult); List<OsuProvider> getMatchingOsuProviders(in List<ScanResult> scanResult); @@ -77,6 +76,8 @@ interface IWifiManager List<PasspointConfiguration> getPasspointConfigurations(); + List<WifiConfiguration> getWifiConfigsForPasspointProfiles(in List<String> fqdnList); + void queryPasspointIcon(long bssid, String fileName); int matchProviderWithCurrentNetwork(String fqdn); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index e67e8ea7d9ab..f2a3b42e1668 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -44,6 +44,7 @@ import android.os.Messenger; import android.os.RemoteException; import android.os.WorkSource; import android.util.Log; +import android.util.Pair; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; @@ -1191,25 +1192,39 @@ public class WifiManager { } /** - * Returns all matching WifiConfigurations for a given list of ScanResult. + * Returns a list of all matching WifiConfigurations for a given list of ScanResult. * * An empty list will be returned when no configurations are installed or if no configurations * match the ScanResult. - + * * @param scanResults a list of scanResult that represents the BSSID - * @return A list of {@link WifiConfiguration} that can have duplicate entries. + * @return List that consists of {@link WifiConfiguration} and corresponding scanResults. * @throws UnsupportedOperationException if Passpoint is not enabled on the device. * @hide */ - @SystemApi @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) - public List<WifiConfiguration> getAllMatchingWifiConfigs( + public List<Pair<WifiConfiguration, List<ScanResult>>> getAllMatchingWifiConfigs( @NonNull List<ScanResult> scanResults) { + List<Pair<WifiConfiguration, List<ScanResult>>> configs = new ArrayList<>(); try { - return mService.getAllMatchingWifiConfigs(scanResults); + Map<String, List<ScanResult>> results = mService.getAllMatchingFqdnsForScanResults( + scanResults); + if (results.isEmpty()) { + return configs; + } + List<WifiConfiguration> wifiConfigurations = + mService.getWifiConfigsForPasspointProfiles(new ArrayList<>(results.keySet())); + for (WifiConfiguration configuration : wifiConfigurations) { + List<ScanResult> scanResultList = results.get(configuration.FQDN); + if (scanResultList != null) { + configs.add(Pair.create(configuration, scanResultList)); + } + } } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } + + return configs; } /** diff --git a/wifi/java/android/net/wifi/aware/PeerHandle.java b/wifi/java/android/net/wifi/aware/PeerHandle.java index 8ae4b5af6325..1603d00fd88a 100644 --- a/wifi/java/android/net/wifi/aware/PeerHandle.java +++ b/wifi/java/android/net/wifi/aware/PeerHandle.java @@ -16,6 +16,9 @@ package android.net.wifi.aware; +import android.os.Parcel; +import android.os.Parcelable; + /** * Opaque object used to represent a Wi-Fi Aware peer. Obtained from discovery sessions in * {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle, byte[], java.util.List)} or @@ -33,7 +36,7 @@ package android.net.wifi.aware; * {@link PublishConfig.Builder#setServiceSpecificInfo(byte[])}, or match filter, * {@link PublishConfig.Builder#setMatchFilter(java.util.List)}. */ -public class PeerHandle { +public final class PeerHandle implements Parcelable { /** @hide */ public PeerHandle(int peerId) { this.peerId = peerId; @@ -59,4 +62,29 @@ public class PeerHandle { public int hashCode() { return peerId; } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(peerId); + } + + public static final Creator<PeerHandle> CREATOR = new Creator<PeerHandle>() { + @Override + public PeerHandle[] newArray(int size) { + return new PeerHandle[size]; + } + + @Override + public PeerHandle createFromParcel(Parcel in) { + int peerHandle = in.readInt(); + + return new PeerHandle(peerHandle); + } + }; + } diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pGroup.java b/wifi/java/android/net/wifi/p2p/WifiP2pGroup.java index 01feb1ef5b42..72e57a16712b 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pGroup.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pGroup.java @@ -17,15 +17,15 @@ package android.net.wifi.p2p; import android.annotation.UnsupportedAppUsage; -import android.os.Parcelable; import android.os.Parcel; +import android.os.Parcelable; import java.util.ArrayList; -import java.util.List; import java.util.Collection; import java.util.Collections; -import java.util.regex.Pattern; +import java.util.List; import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * A class representing a Wi-Fi P2p group. A p2p group consists of a single group @@ -67,6 +67,9 @@ public class WifiP2pGroup implements Parcelable { /** The network id in the wpa_supplicant */ private int mNetId; + /** The frequency used by this group */ + private int mFrequency; + /** P2P group started string pattern */ private static final Pattern groupStartedPattern = Pattern.compile( "ssid=\"(.+)\" " + @@ -116,8 +119,9 @@ public class WifiP2pGroup implements Parcelable { } mNetworkName = match.group(1); - //freq and psk are unused right now - //int freq = Integer.parseInt(match.group(2)); + // It throws NumberFormatException if the string cannot be parsed as an integer. + mFrequency = Integer.parseInt(match.group(2)); + // psk is unused right now //String psk = match.group(3); mPassphrase = match.group(4); mOwner = new WifiP2pDevice(match.group(5)); @@ -269,6 +273,16 @@ public class WifiP2pGroup implements Parcelable { this.mNetId = netId; } + /** Get the operating frequency of the p2p group */ + public int getFrequency() { + return mFrequency; + } + + /** @hide */ + public void setFrequency(int freq) { + this.mFrequency = freq; + } + public String toString() { StringBuffer sbuf = new StringBuffer(); sbuf.append("network: ").append(mNetworkName); @@ -279,6 +293,7 @@ public class WifiP2pGroup implements Parcelable { } sbuf.append("\n interface: ").append(mInterface); sbuf.append("\n networkId: ").append(mNetId); + sbuf.append("\n frequency: ").append(mFrequency); return sbuf.toString(); } @@ -297,6 +312,7 @@ public class WifiP2pGroup implements Parcelable { mPassphrase = source.getPassphrase(); mInterface = source.getInterface(); mNetId = source.getNetworkId(); + mFrequency = source.getFrequency(); } } @@ -312,6 +328,7 @@ public class WifiP2pGroup implements Parcelable { dest.writeString(mPassphrase); dest.writeString(mInterface); dest.writeInt(mNetId); + dest.writeInt(mFrequency); } /** Implement the Parcelable interface */ @@ -329,6 +346,7 @@ public class WifiP2pGroup implements Parcelable { group.setPassphrase(in.readString()); group.setInterface(in.readString()); group.setNetworkId(in.readInt()); + group.setFrequency(in.readInt()); return group; } diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java index 068b959f14ca..1bed914c7772 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java @@ -1281,7 +1281,16 @@ public class WifiP2pManager { c.mAsyncChannel.sendMessage(REMOVE_GROUP, 0, c.putListener(listener)); } - /** @hide */ + /** + * Force p2p to enter or exit listen state + * + * @param c is the channel created at {@link #initialize(Context, Looper, ChannelListener)} + * @param enable enables or disables listening + * @param listener for callbacks on success or failure. Can be null. + * + * @hide + */ + @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void listen(Channel c, boolean enable, ActionListener listener) { checkChannel(c); c.mAsyncChannel.sendMessage(enable ? START_LISTEN : STOP_LISTEN, diff --git a/wifi/java/com/android/server/wifi/AbstractWifiService.java b/wifi/java/com/android/server/wifi/AbstractWifiService.java index e94b9e6c8671..23961080110e 100644 --- a/wifi/java/com/android/server/wifi/AbstractWifiService.java +++ b/wifi/java/com/android/server/wifi/AbstractWifiService.java @@ -106,7 +106,8 @@ public abstract class AbstractWifiService extends IWifiManager.Stub { } @Override - public List<WifiConfiguration> getAllMatchingWifiConfigs(List<ScanResult> scanResults) { + public Map<String, List<ScanResult>> getAllMatchingFqdnsForScanResults( + List<ScanResult> scanResults) { throw new UnsupportedOperationException(); } @@ -155,6 +156,11 @@ public abstract class AbstractWifiService extends IWifiManager.Stub { } @Override + public List<WifiConfiguration> getWifiConfigsForPasspointProfiles(List<String> fqdnList) { + throw new UnsupportedOperationException(); + } + + @Override public void queryPasspointIcon(long bssid, String fileName) { throw new UnsupportedOperationException(); } diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index c43948bb0c04..4fbef5a8493d 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -77,7 +77,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Unit tests for {@link android.net.wifi.WifiManager}. @@ -1274,14 +1276,20 @@ i * Verify that a call to cancel WPS immediately returns a failure. } /** - * Check the call to getAllMatchingWifiConfigs calls getAllMatchingWifiConfigs of WifiService - * with the provided a list of ScanResult. + * Check the call to getAllMatchingWifiConfigs calls getAllMatchingFqdnsForScanResults and + * getWifiConfigsForPasspointProfiles of WifiService in order. */ @Test public void testGetAllMatchingWifiConfigs() throws Exception { + Map<String, List<ScanResult>> fqdns = new HashMap<>(); + fqdns.put("www.test.com", new ArrayList<>()); + when(mWifiService.getAllMatchingFqdnsForScanResults(any(List.class))).thenReturn(fqdns); + InOrder inOrder = inOrder(mWifiService); + mWifiManager.getAllMatchingWifiConfigs(new ArrayList<>()); - verify(mWifiService).getAllMatchingWifiConfigs(any(List.class)); + inOrder.verify(mWifiService).getAllMatchingFqdnsForScanResults(any(List.class)); + inOrder.verify(mWifiService).getWifiConfigsForPasspointProfiles(any(List.class)); } /** diff --git a/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java b/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java index e882b6bb7c1d..ed38c7613a62 100644 --- a/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java +++ b/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java @@ -1382,4 +1382,24 @@ public class WifiAwareManagerTest { assertEquals(cap.getPeerIpv6Addr().toString(), "/fe80::1322:33ff:fe44:5566%5"); assertEquals(cap.hashCode(), rereadCap.hashCode()); } + + // PeerHandle tests + + @Test + public void testPeerHandleParcel() { + final PeerHandle peerHandle = new PeerHandle(5); + + Parcel parcelW = Parcel.obtain(); + peerHandle.writeToParcel(parcelW, 0); + byte[] bytes = parcelW.marshall(); + parcelW.recycle(); + + Parcel parcelR = Parcel.obtain(); + parcelR.unmarshall(bytes, 0, bytes.length); + parcelR.setDataPosition(0); + PeerHandle rereadPeerHandle = PeerHandle.CREATOR.createFromParcel(parcelR); + + assertEquals(peerHandle, rereadPeerHandle); + assertEquals(peerHandle.hashCode(), rereadPeerHandle.hashCode()); + } } |