diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:29:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:29:04 +0000 |
| commit | 896581cb70756caefcf06797b4b4a191ac616238 (patch) | |
| tree | 0c59e7b9f22db96347a7b3dee309f6ad0fc4db97 | |
| parent | 17144fdff56d6131afb1011cf34b56129c36e2e3 (diff) | |
| parent | 756d3b447a8f19a9b7a1088315a8a8bb9855ae1f (diff) | |
| download | base-android10-mainline-networking-release.tar.gz | |
Snap for 6001391 from 756d3b447a8f19a9b7a1088315a8a8bb9855ae1f to qt-aml-networking-releaseandroid-mainline-10.0.0_r6android10-mainline-networking-release
Change-Id: I13e1b1a169683d8b2f7f00c114c408077a69e859
216 files changed, 4320 insertions, 4908 deletions
diff --git a/Android.bp b/Android.bp index 78503775ccea..284e7015c115 100644 --- a/Android.bp +++ b/Android.bp @@ -958,10 +958,10 @@ framework_docs_only_libs = [ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " + "--ignore-classes-on-classpath " + - "--hide-package com.android.okhttp " + - "--hide-package com.android.org.conscrypt --hide-package com.android.server " + + "--hide-package com.android.server " + "--error UnhiddenSystemApi " + "--hide RequiresPermission " + + "--hide CallbackInterface " + "--hide MissingPermission --hide BroadcastBehavior " + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " @@ -1020,7 +1020,6 @@ stubs_defaults { previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", - "ojluni-annotated-sdk-stubs", ], } @@ -1077,7 +1076,6 @@ stubs_defaults { previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", - "ojluni-annotated-sdk-stubs", ], api_levels_annotations_enabled: true, api_levels_annotations_dirs: [ @@ -1412,7 +1410,6 @@ droidstubs { previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", - "ojluni-annotated-sdk-stubs", ], args: " --show-annotation android.annotation.SystemApi", } diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index e731138ff40d..68311176a783 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -1,8 +1,6 @@ [Hook Scripts] checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} -api_lint_hook = ${REPO_ROOT}/frameworks/base/tools/apilint/apilint_sha.sh ${PREUPLOAD_COMMIT} - strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT} hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT} diff --git a/api/current.txt b/api/current.txt index ccb01eac1786..ce4cb250e795 100644 --- a/api/current.txt +++ b/api/current.txt @@ -33984,31 +33984,31 @@ package android.opengl { package android.os { - public abstract class AsyncTask<Params, Progress, Result> { - ctor public AsyncTask(); - method public final boolean cancel(boolean); - method @WorkerThread protected abstract Result doInBackground(Params...); - method @MainThread public final android.os.AsyncTask<Params,Progress,Result> execute(Params...); - method @MainThread public static void execute(Runnable); - method @MainThread public final android.os.AsyncTask<Params,Progress,Result> executeOnExecutor(java.util.concurrent.Executor, Params...); - method public final Result get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException; - method public final Result get(long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException; - method public final android.os.AsyncTask.Status getStatus(); - method public final boolean isCancelled(); - method @MainThread protected void onCancelled(Result); - method @MainThread protected void onCancelled(); - method @MainThread protected void onPostExecute(Result); - method @MainThread protected void onPreExecute(); - method @MainThread protected void onProgressUpdate(Progress...); - method @WorkerThread protected final void publishProgress(Progress...); - field public static final java.util.concurrent.Executor SERIAL_EXECUTOR; - field public static final java.util.concurrent.Executor THREAD_POOL_EXECUTOR; - } - - public enum AsyncTask.Status { - enum_constant public static final android.os.AsyncTask.Status FINISHED; - enum_constant public static final android.os.AsyncTask.Status PENDING; - enum_constant public static final android.os.AsyncTask.Status RUNNING; + @Deprecated public abstract class AsyncTask<Params, Progress, Result> { + ctor @Deprecated public AsyncTask(); + method @Deprecated public final boolean cancel(boolean); + method @Deprecated @WorkerThread protected abstract Result doInBackground(Params...); + method @Deprecated @MainThread public final android.os.AsyncTask<Params,Progress,Result> execute(Params...); + method @Deprecated @MainThread public static void execute(Runnable); + method @Deprecated @MainThread public final android.os.AsyncTask<Params,Progress,Result> executeOnExecutor(java.util.concurrent.Executor, Params...); + method @Deprecated public final Result get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException; + method @Deprecated public final Result get(long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException; + method @Deprecated public final android.os.AsyncTask.Status getStatus(); + method @Deprecated public final boolean isCancelled(); + method @Deprecated @MainThread protected void onCancelled(Result); + method @Deprecated @MainThread protected void onCancelled(); + method @Deprecated @MainThread protected void onPostExecute(Result); + method @Deprecated @MainThread protected void onPreExecute(); + method @Deprecated @MainThread protected void onProgressUpdate(Progress...); + method @Deprecated @WorkerThread protected final void publishProgress(Progress...); + field @Deprecated public static final java.util.concurrent.Executor SERIAL_EXECUTOR; + field @Deprecated public static final java.util.concurrent.Executor THREAD_POOL_EXECUTOR; + } + + @Deprecated public enum AsyncTask.Status { + enum_constant @Deprecated public static final android.os.AsyncTask.Status FINISHED; + enum_constant @Deprecated public static final android.os.AsyncTask.Status PENDING; + enum_constant @Deprecated public static final android.os.AsyncTask.Status RUNNING; } public class BadParcelableException extends android.util.AndroidRuntimeException { @@ -42668,6 +42668,7 @@ package android.system { field public static final int IP_MULTICAST_TTL; field public static final int IP_TOS; field public static final int IP_TTL; + field public static final int MAP_ANONYMOUS; field public static final int MAP_FIXED; field public static final int MAP_PRIVATE; field public static final int MAP_SHARED; @@ -44781,13 +44782,60 @@ package android.telephony { field public static final int MMS_ERROR_RETRY = 6; // 0x6 field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3 field public static final int MMS_ERROR_UNSPECIFIED = 1; // 0x1 + field public static final int RESULT_BLUETOOTH_DISCONNECTED = 27; // 0x1b + field public static final int RESULT_CANCELLED = 23; // 0x17 + field public static final int RESULT_ENCODING_ERROR = 18; // 0x12 + field public static final int RESULT_ERROR_FDN_CHECK_FAILURE = 6; // 0x6 field public static final int RESULT_ERROR_GENERIC_FAILURE = 1; // 0x1 field public static final int RESULT_ERROR_LIMIT_EXCEEDED = 5; // 0x5 + field public static final int RESULT_ERROR_NONE = 0; // 0x0 field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4 field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3 field public static final int RESULT_ERROR_RADIO_OFF = 2; // 0x2 field public static final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8; // 0x8 field public static final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7; // 0x7 + field public static final int RESULT_INTERNAL_ERROR = 21; // 0x15 + field public static final int RESULT_INVALID_ARGUMENTS = 11; // 0xb + field public static final int RESULT_INVALID_BLUETOOTH_ADDRESS = 26; // 0x1a + field public static final int RESULT_INVALID_SMSC_ADDRESS = 19; // 0x13 + field public static final int RESULT_INVALID_SMS_FORMAT = 14; // 0xe + field public static final int RESULT_INVALID_STATE = 12; // 0xc + field public static final int RESULT_MODEM_ERROR = 16; // 0x10 + field public static final int RESULT_NETWORK_ERROR = 17; // 0x11 + field public static final int RESULT_NETWORK_REJECT = 10; // 0xa + field public static final int RESULT_NO_BLUETOOTH_SERVICE = 25; // 0x19 + field public static final int RESULT_NO_DEFAULT_SMS_APP = 32; // 0x20 + field public static final int RESULT_NO_MEMORY = 13; // 0xd + field public static final int RESULT_NO_RESOURCES = 22; // 0x16 + field public static final int RESULT_OPERATION_NOT_ALLOWED = 20; // 0x14 + field public static final int RESULT_RADIO_NOT_AVAILABLE = 9; // 0x9 + field public static final int RESULT_REMOTE_EXCEPTION = 31; // 0x1f + field public static final int RESULT_REQUEST_NOT_SUPPORTED = 24; // 0x18 + field public static final int RESULT_RIL_CANCELLED = 119; // 0x77 + field public static final int RESULT_RIL_ENCODING_ERR = 109; // 0x6d + field public static final int RESULT_RIL_INTERNAL_ERR = 113; // 0x71 + field public static final int RESULT_RIL_INVALID_ARGUMENTS = 104; // 0x68 + field public static final int RESULT_RIL_INVALID_MODEM_STATE = 115; // 0x73 + field public static final int RESULT_RIL_INVALID_SMSC_ADDRESS = 110; // 0x6e + field public static final int RESULT_RIL_INVALID_SMS_FORMAT = 107; // 0x6b + field public static final int RESULT_RIL_INVALID_STATE = 103; // 0x67 + field public static final int RESULT_RIL_MODEM_ERR = 111; // 0x6f + field public static final int RESULT_RIL_NETWORK_ERR = 112; // 0x70 + field public static final int RESULT_RIL_NETWORK_NOT_READY = 116; // 0x74 + field public static final int RESULT_RIL_NETWORK_REJECT = 102; // 0x66 + field public static final int RESULT_RIL_NO_MEMORY = 105; // 0x69 + field public static final int RESULT_RIL_NO_RESOURCES = 118; // 0x76 + field public static final int RESULT_RIL_OPERATION_NOT_ALLOWED = 117; // 0x75 + field public static final int RESULT_RIL_RADIO_NOT_AVAILABLE = 100; // 0x64 + field public static final int RESULT_RIL_REQUEST_NOT_SUPPORTED = 114; // 0x72 + field public static final int RESULT_RIL_REQUEST_RATE_LIMITED = 106; // 0x6a + field public static final int RESULT_RIL_SIM_ABSENT = 120; // 0x78 + field public static final int RESULT_RIL_SMS_SEND_FAIL_RETRY = 101; // 0x65 + field public static final int RESULT_RIL_SYSTEM_ERR = 108; // 0x6c + field public static final int RESULT_SMS_BLOCKED_DURING_EMERGENCY = 29; // 0x1d + field public static final int RESULT_SMS_SEND_RETRY_FAILED = 30; // 0x1e + field public static final int RESULT_SYSTEM_ERROR = 15; // 0xf + field public static final int RESULT_UNEXPECTED_EVENT_STOP_SENDING = 28; // 0x1c field public static final int STATUS_ON_ICC_FREE = 0; // 0x0 field public static final int STATUS_ON_ICC_READ = 1; // 0x1 field public static final int STATUS_ON_ICC_SENT = 5; // 0x5 diff --git a/api/system-current.txt b/api/system-current.txt index 7ea45dcbd7a6..33931122d0f3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1242,9 +1242,13 @@ package android.bluetooth { method public boolean disableBLE(); method public boolean enableBLE(); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean enableNoAutoConnect(); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean factoryReset(); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public long getDiscoveryEndMillis(); method public boolean isBleScanAlwaysAvailable(); method public boolean isLeEnabled(); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean removeOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean setScanMode(int, int); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean setScanMode(int); field public static final String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED"; field public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE"; } @@ -7244,13 +7248,6 @@ package android.telephony { field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallQuality> CREATOR; } - public class CallerInfo { - method @Nullable public android.net.Uri getContactDisplayPhotoUri(); - method public long getContactId(); - method @Nullable public String getName(); - method @Nullable public String getPhoneNumber(); - } - public class CarrierConfigManager { method @NonNull public static android.os.PersistableBundle getDefaultConfig(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void overrideConfig(int, @Nullable android.os.PersistableBundle); @@ -7288,6 +7285,7 @@ package android.telephony { ctor public CellBroadcastService(); method @CallSuper @NonNull public android.os.IBinder onBind(@Nullable android.content.Intent); method public abstract void onCdmaCellBroadcastSms(int, @NonNull byte[], int); + method public abstract void onCdmaScpMessage(int, @NonNull java.util.List<android.telephony.cdma.CdmaSmsCbProgramData>, @NonNull String, @NonNull java.util.function.Consumer<android.os.Bundle>); method public abstract void onGsmCellBroadcastSms(int, @NonNull byte[]); field public static final String CELL_BROADCAST_SERVICE_INTERFACE = "android.telephony.CellBroadcastService"; } @@ -7832,6 +7830,12 @@ package android.telephony { field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PhoneNumberRange> CREATOR; } + public class PhoneNumberUtils { + method @NonNull public static String getUsernameFromUriNumber(@NonNull String); + method public static boolean isUriNumber(@Nullable String); + method public static boolean isVoiceMailNumber(@NonNull android.content.Context, int, @Nullable String); + } + public class PhoneStateListener { method public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes); method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onCallDisconnectCauseChanged(int, int); @@ -8112,25 +8116,8 @@ package android.telephony { public final class SmsManager { method public boolean disableCellBroadcastRange(int, int, int); method public boolean enableCellBroadcastRange(int, int, int); + method public void sendMultipartTextMessage(@NonNull String, @NonNull String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void sendMultipartTextMessageWithoutPersisting(String, String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>); - field public static final int RESULT_CANCELLED = 23; // 0x17 - field public static final int RESULT_ENCODING_ERROR = 18; // 0x12 - field public static final int RESULT_ERROR_FDN_CHECK_FAILURE = 6; // 0x6 - field public static final int RESULT_ERROR_NONE = 0; // 0x0 - field public static final int RESULT_INTERNAL_ERROR = 21; // 0x15 - field public static final int RESULT_INVALID_ARGUMENTS = 11; // 0xb - field public static final int RESULT_INVALID_SMSC_ADDRESS = 19; // 0x13 - field public static final int RESULT_INVALID_SMS_FORMAT = 14; // 0xe - field public static final int RESULT_INVALID_STATE = 12; // 0xc - field public static final int RESULT_MODEM_ERROR = 16; // 0x10 - field public static final int RESULT_NETWORK_ERROR = 17; // 0x11 - field public static final int RESULT_NETWORK_REJECT = 10; // 0xa - field public static final int RESULT_NO_MEMORY = 13; // 0xd - field public static final int RESULT_NO_RESOURCES = 22; // 0x16 - field public static final int RESULT_OPERATION_NOT_ALLOWED = 20; // 0x14 - field public static final int RESULT_RADIO_NOT_AVAILABLE = 9; // 0x9 - field public static final int RESULT_REQUEST_NOT_SUPPORTED = 24; // 0x18 - field public static final int RESULT_SYSTEM_ERROR = 15; // 0xf } public class SubscriptionInfo implements android.os.Parcelable { @@ -8147,6 +8134,7 @@ package android.telephony { method public void requestEmbeddedSubscriptionInfoListRefresh(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultDataSubId(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultSmsSubId(int); + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean); field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI; @@ -8200,7 +8188,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableDataConnectivity(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableModemForSlot(int, boolean); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean); - method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset(int); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int); method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int); method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent); @@ -8216,10 +8203,12 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getDataActivationState(); method @Deprecated public boolean getDataEnabled(); method @Deprecated public boolean getDataEnabled(int); + method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping(); + method public int getMaxNumberOfSimultaneouslyActiveSims(); method public static long getMaxNumberVerificationTimeoutMillis(); method @NonNull public String getNetworkCountryIso(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask(); @@ -8256,6 +8245,7 @@ package android.telephony { method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestNumberVerification(@NonNull android.telephony.PhoneNumberRange, long, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.NumberVerificationCallback); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean resetRadioConfig(); + method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings(); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules); @@ -8696,6 +8686,7 @@ package android.telephony.ims { method public android.os.Bundle getCallExtras(); method public int getCallType(); method public static int getCallTypeFromVideoState(int); + method public int getCallerNumberVerificationStatus(); method public int getEmergencyCallRouting(); method public int getEmergencyServiceCategories(); method @NonNull public java.util.List<java.lang.String> getEmergencyUrns(); @@ -8713,6 +8704,7 @@ package android.telephony.ims { method public void setCallExtraBoolean(String, boolean); method public void setCallExtraInt(String, int); method public void setCallRestrictCause(int); + method public void setCallerNumberVerificationStatus(int); method public void setEmergencyCallRouting(int); method public void setEmergencyCallTesting(boolean); method public void setEmergencyServiceCategories(int); @@ -8763,6 +8755,9 @@ package android.telephony.ims { field public static final int SERVICE_TYPE_EMERGENCY = 2; // 0x2 field public static final int SERVICE_TYPE_NONE = 0; // 0x0 field public static final int SERVICE_TYPE_NORMAL = 1; // 0x1 + field public static final int VERIFICATION_STATUS_FAILED = 2; // 0x2 + field public static final int VERIFICATION_STATUS_NOT_VERIFIED = 0; // 0x0 + field public static final int VERIFICATION_STATUS_PASSED = 1; // 0x1 } public class ImsCallSessionListener { @@ -8858,20 +8853,20 @@ package android.telephony.ims { public class ImsMmTelManager implements android.telephony.ims.RegistrationManager { method @NonNull public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiModeSetting(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiRoamingModeSetting(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAdvancedCallingSettingEnabled(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAvailable(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCapable(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void isSupported(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, @NonNull java.util.function.Consumer<java.lang.Boolean>, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException; + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void isSupported(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isTtyOverVolteEnabled(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVoWiFiRoamingSettingEnabled(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVoWiFiSettingEnabled(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVtSettingEnabled(); method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException; + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerMmTelCapabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAdvancedCallingSettingEnabled(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRttCapabilitySetting(boolean); @@ -9331,9 +9326,9 @@ package android.telephony.ims { } public interface RegistrationManager { - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException; + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback); field public static final int REGISTRATION_STATE_NOT_REGISTERED = 0; // 0x0 field public static final int REGISTRATION_STATE_REGISTERED = 2; // 0x2 diff --git a/api/test-current.txt b/api/test-current.txt index 566465b64038..9fac1e05a453 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2866,6 +2866,9 @@ package android.telephony { public class PhoneNumberUtils { method public static int getMinMatchForTest(); + method @NonNull public static String getUsernameFromUriNumber(@NonNull String); + method public static boolean isUriNumber(@Nullable String); + method public static boolean isVoiceMailNumber(@NonNull android.content.Context, int, @Nullable String); method public static void setMinMatchForTest(int); } @@ -2889,6 +2892,7 @@ package android.telephony { public final class SmsManager { method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int checkSmsShortCodeDestination(String, String); + method public void sendMultipartTextMessage(@NonNull String, @NonNull String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String); field public static final int SMS_CATEGORY_FREE_SHORT_CODE = 1; // 0x1 field public static final int SMS_CATEGORY_NOT_SHORT_CODE = 0; // 0x0 field public static final int SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE = 3; // 0x3 @@ -2896,9 +2900,14 @@ package android.telephony { field public static final int SMS_CATEGORY_STANDARD_SHORT_CODE = 2; // 0x2 } + public class SubscriptionManager { + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int); + } + public class TelephonyManager { method public int checkCarrierPrivilegesForPackage(String); method public int getCarrierIdListVersion(); + method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag(); method @NonNull public String getNetworkCountryIso(int); method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion(); diff --git a/config/hiddenapi-greylist-max-p.txt b/config/hiddenapi-greylist-max-p.txt index 34339d7a27bb..351e71dd9538 100644 --- a/config/hiddenapi-greylist-max-p.txt +++ b/config/hiddenapi-greylist-max-p.txt @@ -1,56 +1,14 @@ Landroid/app/IInstrumentationWatcher$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IInstrumentationWatcher; Landroid/app/ISearchManager$Stub;-><init>()V Landroid/app/IUiModeManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IUiModeManager; -Landroid/app/IUiModeManager;->disableCarMode(I)V Landroid/bluetooth/IBluetooth$Stub;-><init>()V Landroid/bluetooth/IBluetoothA2dp$Stub;-><init>()V Landroid/content/IIntentReceiver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentReceiver; Landroid/content/IIntentSender$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentSender; -Landroid/net/IConnectivityManager;->getNetworkInfo(I)Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager;->reportInetCondition(II)V -Landroid/os/BatteryStats$Counter;-><init>()V -Landroid/os/BatteryStats$HistoryItem;->clear()V -Landroid/os/BatteryStats$HistoryItem;->next:Landroid/os/BatteryStats$HistoryItem; -Landroid/os/BatteryStats$HistoryItem;->same(Landroid/os/BatteryStats$HistoryItem;)Z -Landroid/os/BatteryStats$HistoryItem;->setTo(JBLandroid/os/BatteryStats$HistoryItem;)V -Landroid/os/BatteryStats$HistoryItem;->setTo(Landroid/os/BatteryStats$HistoryItem;)V -Landroid/os/BatteryStats$Timer;-><init>()V -Landroid/os/BatteryStats$Uid$Pkg;-><init>()V -Landroid/os/BatteryStats$Uid$Proc;-><init>()V -Landroid/os/BatteryStats$Uid$Sensor;-><init>()V -Landroid/os/BatteryStats$Uid$Wakelock;-><init>()V -Landroid/os/BatteryStats;-><init>()V -Landroid/os/BatteryStats;->getMobileRadioActiveTime(JI)J -Landroid/os/BatteryStats;->getNetworkActivityBytes(II)J -Landroid/os/CancellationSignal;->mCancelInProgress:Z -Landroid/os/CancellationSignal;->mIsCanceled:Z -Landroid/os/CancellationSignal;->mOnCancelListener:Landroid/os/CancellationSignal$OnCancelListener; -Landroid/os/CancellationSignal;->mRemote:Landroid/os/ICancellationSignal; -Landroid/os/CancellationSignal;->waitForCancelFinishedLocked()V -Landroid/os/IPowerManager;->nap(J)V -Landroid/os/Parcel;->mCreators:Ljava/util/HashMap; -Landroid/os/PowerManager;->mHandler:Landroid/os/Handler; -Landroid/os/Process;->sendSignalQuiet(II)V -Landroid/os/Registrant;->getHandler()Landroid/os/Handler; -Landroid/os/RegistrantList;->get(I)Ljava/lang/Object; -Landroid/os/RemoteCallback;->mHandler:Landroid/os/Handler; Landroid/os/storage/IObbActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IObbActionListener; -Landroid/os/SystemProperties;->native_add_change_callback()V -Landroid/os/SystemProperties;->native_get(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Landroid/os/SystemProperties;->native_get_boolean(Ljava/lang/String;Z)Z -Landroid/os/SystemProperties;->native_get_int(Ljava/lang/String;I)I -Landroid/os/SystemProperties;->native_set(Ljava/lang/String;Ljava/lang/String;)V -Landroid/os/UserHandle;->formatUid(Ljava/io/PrintWriter;I)V -Landroid/os/WorkSource;->sGoneWork:Landroid/os/WorkSource; -Landroid/os/WorkSource;->sNewbWork:Landroid/os/WorkSource; -Landroid/os/WorkSource;->sTmpWorkSource:Landroid/os/WorkSource; -Landroid/os/WorkSource;->updateLocked(Landroid/os/WorkSource;ZZ)Z Landroid/service/carrier/ICarrierMessagingCallback$Stub;-><init>()V -Landroid/service/carrier/ICarrierMessagingService;->filterSms(Landroid/service/carrier/MessagePdu;Ljava/lang/String;IILandroid/service/carrier/ICarrierMessagingCallback;)V Landroid/view/IGraphicsStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/view/IGraphicsStats$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IGraphicsStats; -Landroid/view/IWindowManager;->setInTouchMode(Z)V -Landroid/view/IWindowManager;->showStrictModeViolation(Z)V Lcom/android/internal/R$styleable;->AndroidManifestActivityAlias:[I Lcom/android/internal/R$styleable;->AndroidManifestGrantUriPermission:[I Lcom/android/internal/R$styleable;->AndroidManifestInstrumentation:[I @@ -69,10 +27,3 @@ Lcom/android/internal/R$styleable;->MenuView:[I Lcom/android/internal/R$styleable;->Searchable:[I Lcom/android/internal/R$styleable;->SearchableActionKey:[I Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V -Lcom/android/internal/telephony/ITelephony;->getDataActivity()I -Lcom/android/internal/telephony/ITelephony;->getDataState()I -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyOtaspChanged(II)V -Lcom/android/internal/view/BaseIWindow;-><init>()V diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt index 2611e969f4be..2d3394be1ad0 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-greylist.txt @@ -1,6 +1,4 @@ Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accessibilityservice/IAccessibilityServiceConnection; -Landroid/accounts/AccountManager$AmsTask;-><init>(Landroid/accounts/AccountManager;Landroid/app/Activity;Landroid/os/Handler;Landroid/accounts/AccountManagerCallback;)V -Landroid/accounts/AccountManager$Future2Task;-><init>(Landroid/accounts/AccountManager;Landroid/os/Handler;Landroid/accounts/AccountManagerCallback;)V Landroid/accounts/IAccountAuthenticator$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/accounts/IAccountAuthenticator$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/accounts/IAccountAuthenticator$Stub;-><init>()V @@ -16,10 +14,6 @@ Landroid/accounts/IAccountManagerResponse$Stub$Proxy;-><init>(Landroid/os/IBinde Landroid/accounts/IAccountManagerResponse$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/accounts/IAccountManagerResponse$Stub;-><init>()V Landroid/accounts/IAccountManagerResponse$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountManagerResponse; -Landroid/app/ActivityManagerNative;-><init>()V -Landroid/app/ActivityThread$AppBindData;-><init>()V -Landroid/app/ActivityThread$CreateServiceData;-><init>()V -Landroid/app/ActivityThread$H;-><init>(Landroid/app/ActivityThread;)V Landroid/app/admin/IDevicePolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/admin/IDevicePolicyManager; Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_packageHasActiveAdmins:I Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_removeActiveAdmin:I @@ -35,8 +29,6 @@ Landroid/app/IActivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/app/IActivityManager$Stub$Proxy;->setActivityController(Landroid/app/IActivityController;Z)V Landroid/app/IActivityManager$Stub$Proxy;->updatePersistentConfiguration(Landroid/content/res/Configuration;)V Landroid/app/IActivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IActivityManager; -Landroid/app/IActivityManager;->finishReceiver(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/Bundle;ZI)V -Landroid/app/IActivityManager;->serviceDoneExecuting(Landroid/os/IBinder;III)V Landroid/app/IAlarmManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/app/IAlarmManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IAlarmManager; Landroid/app/IAlarmManager$Stub;->TRANSACTION_remove:I @@ -73,56 +65,25 @@ Landroid/app/job/IJobService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/app/job/IJobService$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/app/job/IJobService$Stub;-><init>()V Landroid/app/job/IJobService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobService; -Landroid/app/PackageDeleteObserver;-><init>()V -Landroid/app/PackageInstallObserver;-><init>()V -Landroid/app/ResourcesManager$ActivityResources;-><init>()V -Landroid/app/ResourcesManager;-><init>()V -Landroid/app/TaskStackListener;-><init>()V Landroid/app/trust/ITrustManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/UiAutomationConnection;-><init>()V Landroid/app/usage/IUsageStatsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/usage/IUsageStatsManager; -Landroid/app/UserSwitchObserver;-><init>()V Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String; Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I Landroid/bluetooth/IBluetooth$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetooth; Landroid/bluetooth/IBluetooth$Stub;->TRANSACTION_enable:I -Landroid/bluetooth/IBluetooth;->fetchRemoteUuids(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/IBluetooth;->getAddress()Ljava/lang/String; -Landroid/bluetooth/IBluetooth;->getRemoteAlias(Landroid/bluetooth/BluetoothDevice;)Ljava/lang/String; -Landroid/bluetooth/IBluetooth;->isEnabled()Z -Landroid/bluetooth/IBluetooth;->sendConnectionStateChange(Landroid/bluetooth/BluetoothDevice;III)V Landroid/bluetooth/IBluetoothA2dp$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothA2dp; -Landroid/bluetooth/IBluetoothA2dp;->connect(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/IBluetoothA2dp;->disconnect(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/IBluetoothA2dp;->getConnectedDevices()Ljava/util/List; -Landroid/bluetooth/IBluetoothA2dp;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I -Landroid/bluetooth/IBluetoothA2dp;->getDevicesMatchingConnectionStates([I)Ljava/util/List; -Landroid/bluetooth/IBluetoothA2dp;->getPriority(Landroid/bluetooth/BluetoothDevice;)I Landroid/bluetooth/IBluetoothCallback$Stub;-><init>()V -Landroid/bluetooth/IBluetoothGatt;->registerClient(Landroid/os/ParcelUuid;Landroid/bluetooth/IBluetoothGattCallback;)V -Landroid/bluetooth/IBluetoothGatt;->unregisterClient(I)V Landroid/bluetooth/IBluetoothGattCallback$Stub;-><init>()V Landroid/bluetooth/IBluetoothGattCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothGattCallback; Landroid/bluetooth/IBluetoothHeadset$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothHeadset; -Landroid/bluetooth/IBluetoothHeadset;->connect(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/IBluetoothHeadset;->disconnect(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/IBluetoothHeadset;->getConnectedDevices()Ljava/util/List; -Landroid/bluetooth/IBluetoothHeadset;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I -Landroid/bluetooth/IBluetoothHeadset;->getPriority(Landroid/bluetooth/BluetoothDevice;)I -Landroid/bluetooth/IBluetoothHeadset;->setPriority(Landroid/bluetooth/BluetoothDevice;I)Z Landroid/bluetooth/IBluetoothHidDeviceCallback$Stub;-><init>()V Landroid/bluetooth/IBluetoothManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/bluetooth/IBluetoothManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothManager; Landroid/bluetooth/IBluetoothManager$Stub;->TRANSACTION_enable:I -Landroid/bluetooth/IBluetoothManager;->getBluetoothGatt()Landroid/bluetooth/IBluetoothGatt; -Landroid/bluetooth/IBluetoothManager;->registerStateChangeCallback(Landroid/bluetooth/IBluetoothStateChangeCallback;)V -Landroid/bluetooth/IBluetoothManager;->unregisterStateChangeCallback(Landroid/bluetooth/IBluetoothStateChangeCallback;)V Landroid/bluetooth/IBluetoothManagerCallback$Stub;-><init>()V Landroid/bluetooth/IBluetoothPbap$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothPbap; Landroid/bluetooth/IBluetoothStateChangeCallback$Stub;-><init>()V Landroid/companion/ICompanionDeviceDiscoveryService$Stub;-><init>()V -Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V -Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelectionCancel()V Landroid/content/IClipboard$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/content/IClipboard$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IClipboard; Landroid/content/IContentService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V @@ -189,14 +150,8 @@ Landroid/content/pm/IPackageStatsObserver$Stub;-><init>()V Landroid/content/pm/IPackageStatsObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageStatsObserver; Landroid/content/pm/IShortcutService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/content/pm/IShortcutService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IShortcutService; -Landroid/content/res/ConfigurationBoundResourceCache;-><init>()V -Landroid/content/res/DrawableCache;-><init>()V -Landroid/content/UndoManager;-><init>()V Landroid/database/IContentObserver$Stub;-><init>()V Landroid/database/IContentObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/database/IContentObserver; -Landroid/database/IContentObserver;->onChange(ZLandroid/net/Uri;I)V -Landroid/database/sqlite/SQLiteConnectionPool;->$assertionsDisabled:Z -Landroid/database/sqlite/SQLiteDatabase;->$assertionsDisabled:Z Landroid/hardware/display/IDisplayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/display/IDisplayManager; Landroid/hardware/fingerprint/IFingerprintService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/hardware/fingerprint/IFingerprintService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/fingerprint/IFingerprintService; @@ -221,7 +176,6 @@ Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager; Landroid/location/ILocationManager$Stub;->TRANSACTION_getAllProviders:I Landroid/location/INetInitiatedListener$Stub;-><init>()V -Landroid/location/LocationManager$ListenerTransport;-><init>(Landroid/location/LocationManager;Landroid/location/LocationListener;Landroid/os/Looper;)V Landroid/Manifest$permission;->CAPTURE_SECURE_VIDEO_OUTPUT:Ljava/lang/String; Landroid/Manifest$permission;->CAPTURE_VIDEO_OUTPUT:Ljava/lang/String; Landroid/Manifest$permission;->READ_FRAME_BUFFER:Ljava/lang/String; @@ -232,13 +186,9 @@ Landroid/media/IAudioService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/me Landroid/media/IMediaRouterService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IMediaRouterService; Landroid/media/IMediaScannerListener$Stub;-><init>()V Landroid/media/IMediaScannerService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IMediaScannerService; -Landroid/media/IRingtonePlayer;->play(Landroid/os/IBinder;Landroid/net/Uri;Landroid/media/AudioAttributes;FZ)V Landroid/media/IVolumeController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IVolumeController; -Landroid/media/MediaFile;-><init>()V -Landroid/media/MediaScanner$MyMediaScannerClient;-><init>(Landroid/media/MediaScanner;)V Landroid/media/session/ISessionManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/session/ISessionManager; Landroid/media/tv/ITvRemoteProvider$Stub;-><init>()V -Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V Landroid/net/IConnectivityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveLinkProperties()Landroid/net/LinkProperties; Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetworkInfo()Landroid/net/NetworkInfo; @@ -256,12 +206,8 @@ Landroid/net/INetworkScoreService$Stub;->asInterface(Landroid/os/IBinder;)Landro Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String; Landroid/net/INetworkStatsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsService; -Landroid/net/InterfaceConfiguration;-><init>()V -Landroid/net/LinkProperties$ProvisioningChange;->values()[Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/MobileLinkQualityInfo;-><init>()V Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager; Landroid/net/sip/ISipSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/sip/ISipSession; -Landroid/net/SntpClient;-><init>()V Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager; Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I @@ -271,16 +217,11 @@ Landroid/net/wifi/IWifiScanner$Stub;-><init>()V Landroid/net/wifi/IWifiScanner$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiScanner; Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/p2p/IWifiP2pManager; Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I -Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;-><init>()V -Landroid/os/BatteryStats$Uid;-><init>()V Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/IDeviceIdentifiersPolicyService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IDeviceIdentifiersPolicyService; Landroid/os/IDeviceIdleController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IDeviceIdleController; -Landroid/os/IDeviceIdleController;->getAppIdTempWhitelist()[I -Landroid/os/IDeviceIdleController;->getFullPowerWhitelistExceptIdle()[Ljava/lang/String; Landroid/os/INetworkManagementService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/INetworkManagementService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/INetworkManagementService; -Landroid/os/INetworkManagementService;->listTetheredInterfaces()[Ljava/lang/String; Landroid/os/IPermissionController$Stub$Proxy;->checkPermission(Ljava/lang/String;II)Z Landroid/os/IPermissionController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPermissionController; Landroid/os/IPowerManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V @@ -291,17 +232,12 @@ Landroid/os/IPowerManager$Stub;->TRANSACTION_goToSleep:I Landroid/os/IRecoverySystem$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IRecoverySystem; Landroid/os/IRemoteCallback$Stub;-><init>()V Landroid/os/IUpdateEngine$Stub;-><init>()V -Landroid/os/IUpdateEngineCallback;->onStatusUpdate(IF)V Landroid/os/IUserManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/IUserManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IUserManager; Landroid/os/IVibratorService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IVibratorService; -Landroid/os/Parcel$ReadWriteHelper;-><init>()V -Landroid/os/RegistrantList;-><init>()V -Landroid/os/ServiceManager;-><init>()V Landroid/os/storage/IObbActionListener$Stub;-><init>()V Landroid/os/storage/IStorageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/storage/IStorageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IStorageManager; -Landroid/os/storage/StorageEventListener;-><init>()V Landroid/R$styleable;->ActionBar:[I Landroid/R$styleable;->ActionBar_background:I Landroid/R$styleable;->ActionBar_backgroundSplit:I @@ -568,18 +504,7 @@ Landroid/R$styleable;->Window_windowBackground:I Landroid/R$styleable;->Window_windowFrame:I Landroid/security/IKeyChainService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/security/IKeyChainService; Landroid/security/keystore/IKeystoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/security/keystore/IKeystoreService; -Landroid/security/keystore/IKeystoreService;->clear_uid(J)I -Landroid/security/keystore/IKeystoreService;->del(Ljava/lang/String;I)I -Landroid/security/keystore/IKeystoreService;->exist(Ljava/lang/String;I)I -Landroid/security/keystore/IKeystoreService;->get(Ljava/lang/String;I)[B -Landroid/security/keystore/IKeystoreService;->getState(I)I -Landroid/security/keystore/IKeystoreService;->insert(Ljava/lang/String;[BII)I -Landroid/security/keystore/IKeystoreService;->is_hardware_backed(Ljava/lang/String;)I -Landroid/security/keystore/IKeystoreService;->list(Ljava/lang/String;I)[Ljava/lang/String; -Landroid/security/keystore/IKeystoreService;->reset()I -Landroid/security/keystore/IKeystoreService;->ungrant(Ljava/lang/String;I)I Landroid/service/dreams/IDreamManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/dreams/IDreamManager; -Landroid/service/dreams/IDreamManager;->getDreamComponents()[Landroid/content/ComponentName; Landroid/service/euicc/IEuiccService$Stub;-><init>()V Landroid/service/media/IMediaBrowserServiceCallbacks$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/media/IMediaBrowserServiceCallbacks; Landroid/service/notification/INotificationListener$Stub;-><init>()V @@ -587,18 +512,11 @@ Landroid/service/persistentdata/IPersistentDataBlockService$Stub;->asInterface(L Landroid/service/vr/IVrManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/vr/IVrManager; Landroid/service/wallpaper/IWallpaperConnection$Stub;-><init>()V Landroid/service/wallpaper/IWallpaperService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/wallpaper/IWallpaperService; -Landroid/telephony/ims/compat/feature/MMTelFeature;-><init>()V -Landroid/telephony/ims/compat/ImsService;-><init>()V -Landroid/telephony/ims/compat/stub/ImsCallSessionImplBase;-><init>()V -Landroid/telephony/ims/compat/stub/ImsUtListenerImplBase;-><init>()V Landroid/telephony/mbms/IMbmsStreamingSessionCallback$Stub;-><init>()V Landroid/telephony/mbms/IStreamingServiceCallback$Stub;-><init>()V Landroid/telephony/mbms/vendor/IMbmsStreamingService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/telephony/mbms/vendor/IMbmsStreamingService; -Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/util/Singleton;-><init>()V Landroid/view/accessibility/IAccessibilityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/view/accessibility/IAccessibilityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/accessibility/IAccessibilityManager; -Landroid/view/AccessibilityIterators$AbstractTextSegmentIterator;-><init>()V Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/view/autofill/IAutoFillManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/autofill/IAutoFillManager; Landroid/view/IAppTransitionAnimationSpecsFuture$Stub;-><init>()V @@ -617,30 +535,10 @@ Landroid/view/IWindowManager$Stub$Proxy;->watchRotation(Landroid/view/IRotationW Landroid/view/IWindowManager$Stub;-><init>()V Landroid/view/IWindowManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindowManager; Landroid/view/IWindowSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindowSession; -Landroid/view/View$AttachInfo$InvalidateInfo;-><init>()V -Landroid/view/View$CheckForLongPress;-><init>(Landroid/view/View;)V -Landroid/view/View$ListenerInfo;-><init>()V -Landroid/view/ViewTreeObserver$InternalInsetsInfo;-><init>()V -Landroid/webkit/CacheManager$CacheResult;-><init>()V Landroid/webkit/IWebViewUpdateService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/webkit/IWebViewUpdateService$Stub$Proxy;->waitForAndGetProvider()Landroid/webkit/WebViewProviderResponse; Landroid/webkit/IWebViewUpdateService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/webkit/IWebViewUpdateService; -Landroid/widget/DigitalClock$FormatChangeObserver;-><init>(Landroid/widget/DigitalClock;)V -Landroid/widget/QuickContactBadge$QueryHandler;-><init>(Landroid/widget/QuickContactBadge;Landroid/content/ContentResolver;)V -Landroid/widget/RelativeLayout$DependencyGraph$Node;-><init>()V -Landroid/widget/ScrollBarDrawable;-><init>()V -Lcom/android/ims/ImsCall;->deflect(Ljava/lang/String;)V -Lcom/android/ims/ImsCall;->isMultiparty()Z -Lcom/android/ims/ImsCall;->reject(I)V -Lcom/android/ims/ImsCall;->terminate(I)V Lcom/android/ims/ImsConfigListener$Stub;-><init>()V -Lcom/android/ims/ImsEcbm;->exitEmergencyCallbackMode()V -Lcom/android/ims/ImsManager;->getConfigInterface()Lcom/android/ims/ImsConfig; -Lcom/android/ims/ImsManager;->getInstance(Landroid/content/Context;I)Lcom/android/ims/ImsManager; -Lcom/android/ims/ImsManager;->isEnhanced4gLteModeSettingEnabledByUser(Landroid/content/Context;)Z -Lcom/android/ims/ImsManager;->isNonTtyOrTtyOnVolteEnabled(Landroid/content/Context;)Z -Lcom/android/ims/ImsManager;->isVolteEnabledByPlatform(Landroid/content/Context;)Z -Lcom/android/ims/ImsUtInterface;->queryCallForward(ILjava/lang/String;Landroid/os/Message;)V Lcom/android/ims/internal/IImsCallSession$Stub;-><init>()V Lcom/android/ims/internal/IImsCallSession$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/ims/internal/IImsCallSession; Lcom/android/ims/internal/IImsConfig$Stub;-><init>()V @@ -649,13 +547,10 @@ Lcom/android/ims/internal/IImsService$Stub;-><init>()V Lcom/android/ims/internal/IImsService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/ims/internal/IImsService; Lcom/android/ims/internal/IImsUt$Stub;-><init>()V Lcom/android/ims/internal/IImsVideoCallProvider$Stub;-><init>()V -Lcom/android/ims/internal/ImsVideoCallProviderWrapper;-><init>(Lcom/android/ims/internal/IImsVideoCallProvider;)V Lcom/android/ims/internal/uce/options/IOptionsService$Stub;-><init>()V Lcom/android/ims/internal/uce/presence/IPresenceService$Stub;-><init>()V Lcom/android/ims/internal/uce/uceservice/IUceListener$Stub;-><init>()V Lcom/android/ims/internal/uce/uceservice/IUceService$Stub;-><init>()V -Lcom/android/internal/app/AlertActivity;-><init>()V -Lcom/android/internal/app/ChooserActivity;-><init>()V Lcom/android/internal/app/IAppOpsCallback$Stub;-><init>()V Lcom/android/internal/app/IAppOpsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->checkOperation(IILjava/lang/String;)I @@ -684,35 +579,16 @@ Lcom/android/internal/app/IBatteryStats$Stub;->asInterface(Landroid/os/IBinder;) Lcom/android/internal/app/IMediaContainerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IMediaContainerService; Lcom/android/internal/app/IVoiceInteractionManagerService$Stub$Proxy;->showSessionFromSession(Landroid/os/IBinder;Landroid/os/Bundle;I)Z Lcom/android/internal/app/IVoiceInteractionManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IVoiceInteractionManagerService; -Lcom/android/internal/app/ResolverActivity;-><init>()V Lcom/android/internal/appwidget/IAppWidgetService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/appwidget/IAppWidgetService; Lcom/android/internal/appwidget/IAppWidgetService$Stub;->TRANSACTION_bindAppWidgetId:I Lcom/android/internal/backup/IBackupTransport$Stub;-><init>()V -Lcom/android/internal/content/PackageMonitor;-><init>()V -Lcom/android/internal/location/GpsNetInitiatedHandler$GpsNiNotification;-><init>()V -Lcom/android/internal/location/GpsNetInitiatedHandler$GpsNiNotification;->requestorId:Ljava/lang/String; -Lcom/android/internal/location/GpsNetInitiatedHandler$GpsNiNotification;->requestorIdEncoding:I -Lcom/android/internal/location/GpsNetInitiatedHandler$GpsNiNotification;->text:Ljava/lang/String; -Lcom/android/internal/location/GpsNetInitiatedHandler$GpsNiNotification;->textEncoding:I -Lcom/android/internal/location/GpsNetInitiatedHandler;->decodeString(Ljava/lang/String;ZI)Ljava/lang/String; -Lcom/android/internal/location/GpsNetInitiatedHandler;->handleNiNotification(Lcom/android/internal/location/GpsNetInitiatedHandler$GpsNiNotification;)V -Lcom/android/internal/location/GpsNetInitiatedHandler;->mIsHexInput:Z Lcom/android/internal/location/ILocationProvider$Stub;-><init>()V Lcom/android/internal/location/ILocationProvider$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/location/ILocationProvider; -Lcom/android/internal/location/ILocationProvider;->sendExtraCommand(Ljava/lang/String;Landroid/os/Bundle;)V -Lcom/android/internal/location/ILocationProvider;->setLocationProviderManager(Lcom/android/internal/location/ILocationProviderManager;)V -Lcom/android/internal/location/ILocationProvider;->setRequest(Lcom/android/internal/location/ProviderRequest;Landroid/os/WorkSource;)V Lcom/android/internal/location/ILocationProviderManager$Stub;-><init>()V Lcom/android/internal/location/ILocationProviderManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/location/ILocationProviderManager; -Lcom/android/internal/logging/MetricsLogger;-><init>()V -Lcom/android/internal/net/LegacyVpnInfo;-><init>()V -Lcom/android/internal/net/VpnConfig;-><init>()V -Lcom/android/internal/os/BaseCommand;-><init>()V -Lcom/android/internal/os/BatterySipper$DrainType;->values()[Lcom/android/internal/os/BatterySipper$DrainType; Lcom/android/internal/os/IDropBoxManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/os/IDropBoxManagerService; Lcom/android/internal/policy/IKeyguardService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/policy/IKeyguardService; Lcom/android/internal/policy/IKeyguardStateCallback$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/policy/IKeyguardStateCallback; -Lcom/android/internal/preference/YesNoPreference;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V Lcom/android/internal/R$anim;->fade_in:I Lcom/android/internal/R$array;->config_autoBrightnessLcdBacklightValues:I Lcom/android/internal/R$array;->config_autoBrightnessLevels:I @@ -1157,208 +1033,9 @@ Lcom/android/internal/statusbar/IStatusBar$Stub;->asInterface(Landroid/os/IBinde Lcom/android/internal/statusbar/IStatusBarService$Stub;-><init>()V Lcom/android/internal/statusbar/IStatusBarService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/statusbar/IStatusBarService; Lcom/android/internal/telecom/ITelecomService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telecom/ITelecomService; -Lcom/android/internal/telephony/Call$State;->ALERTING:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->DIALING:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->DISCONNECTED:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->DISCONNECTING:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->HOLDING:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->IDLE:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->INCOMING:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->values()[Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->WAITING:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call;-><init>()V -Lcom/android/internal/telephony/CallForwardInfo;-><init>()V -Lcom/android/internal/telephony/CallTracker;-><init>()V -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->values()[Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/ResponseData;-><init>()V -Lcom/android/internal/telephony/cat/ResultCode;->values()[Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/RilMessageDecoder;->mCurrentRilMessage:Lcom/android/internal/telephony/cat/RilMessage; -Lcom/android/internal/telephony/cat/RilMessageDecoder;->sendCmdForExecution(Lcom/android/internal/telephony/cat/RilMessage;)V -Lcom/android/internal/telephony/cat/RilMessageDecoder;->sendStartDecodingMessageParams(Lcom/android/internal/telephony/cat/RilMessage;)V -Lcom/android/internal/telephony/cat/ValueObject;-><init>()V -Lcom/android/internal/telephony/cat/ValueParser;->retrieveDeviceIdentities(Lcom/android/internal/telephony/cat/ComprehensionTlv;)Lcom/android/internal/telephony/cat/DeviceIdentities; -Lcom/android/internal/telephony/cdma/sms/BearerData$CodingException;-><init>(Ljava/lang/String;)V -Lcom/android/internal/telephony/cdma/sms/BearerData$TimeStamp;-><init>()V -Lcom/android/internal/telephony/cdma/sms/BearerData;-><init>()V -Lcom/android/internal/telephony/cdma/sms/BearerData;->countAsciiSeptets(Ljava/lang/CharSequence;Z)I -Lcom/android/internal/telephony/cdma/sms/BearerData;->decodeUserDataPayload(Lcom/android/internal/telephony/cdma/sms/UserData;Z)V -Lcom/android/internal/telephony/cdma/sms/BearerData;->displayMode:I -Lcom/android/internal/telephony/cdma/sms/BearerData;->encode(Lcom/android/internal/telephony/cdma/sms/BearerData;)[B -Lcom/android/internal/telephony/cdma/sms/BearerData;->encode7bitAscii(Ljava/lang/String;Z)[B -Lcom/android/internal/telephony/cdma/sms/BearerData;->getBitsForNumFields(II)I -Lcom/android/internal/telephony/cdma/sms/BearerData;->hasUserDataHeader:Z -Lcom/android/internal/telephony/cdma/sms/BearerData;->messageId:I -Lcom/android/internal/telephony/cdma/sms/BearerData;->msgCenterTimeStamp:Lcom/android/internal/telephony/cdma/sms/BearerData$TimeStamp; -Lcom/android/internal/telephony/cdma/sms/BearerData;->priority:I -Lcom/android/internal/telephony/cdma/sms/BearerData;->priorityIndicatorSet:Z -Lcom/android/internal/telephony/cdma/sms/BearerData;->userData:Lcom/android/internal/telephony/cdma/sms/UserData; -Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;-><init>()V -Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;->digitMode:I -Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;->numberMode:I -Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;->numberOfDigits:I -Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;->numberPlan:I -Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;->parse(Ljava/lang/String;)Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress; -Lcom/android/internal/telephony/cdma/sms/SmsEnvelope;-><init>()V -Lcom/android/internal/telephony/cdma/sms/SmsEnvelope;->bearerData:[B -Lcom/android/internal/telephony/cdma/sms/SmsEnvelope;->serviceCategory:I -Lcom/android/internal/telephony/cdma/sms/SmsEnvelope;->teleService:I -Lcom/android/internal/telephony/cdma/sms/UserData;-><init>()V -Lcom/android/internal/telephony/cdma/sms/UserData;->charToAscii:Landroid/util/SparseIntArray; -Lcom/android/internal/telephony/cdma/sms/UserData;->msgEncoding:I -Lcom/android/internal/telephony/cdma/sms/UserData;->msgEncodingSet:Z -Lcom/android/internal/telephony/cdma/sms/UserData;->numFields:I -Lcom/android/internal/telephony/cdma/sms/UserData;->payload:[B -Lcom/android/internal/telephony/cdma/sms/UserData;->payloadStr:Ljava/lang/String; -Lcom/android/internal/telephony/cdma/sms/UserData;->userDataHeader:Lcom/android/internal/telephony/SmsHeader; -Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu;-><init>()V -Lcom/android/internal/telephony/cdma/SmsMessage;-><init>()V -Lcom/android/internal/telephony/cdma/SmsMessage;->calculateLength(Ljava/lang/CharSequence;ZZ)Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails; -Lcom/android/internal/telephony/cdma/SmsMessage;->createFromEfRecord(I[B)Lcom/android/internal/telephony/cdma/SmsMessage; -Lcom/android/internal/telephony/cdma/SmsMessage;->createFromPdu([B)Lcom/android/internal/telephony/cdma/SmsMessage; -Lcom/android/internal/telephony/cdma/SmsMessage;->getIncomingSmsFingerprint()[B -Lcom/android/internal/telephony/cdma/SmsMessage;->getMessageType()I -Lcom/android/internal/telephony/cdma/SmsMessage;->getNextMessageId()I -Lcom/android/internal/telephony/cdma/SmsMessage;->getNumOfVoicemails()I -Lcom/android/internal/telephony/cdma/SmsMessage;->getSubmitPdu(Ljava/lang/String;Lcom/android/internal/telephony/cdma/sms/UserData;Z)Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/cdma/SmsMessage;->getSubmitPdu(Ljava/lang/String;Lcom/android/internal/telephony/cdma/sms/UserData;ZI)Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/cdma/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;I[BZ)Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/cdma/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/android/internal/telephony/SmsHeader;)Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/cdma/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/android/internal/telephony/SmsHeader;I)Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/cdma/SmsMessage;->getTeleService()I -Lcom/android/internal/telephony/cdma/SmsMessage;->isStatusReportMessage()Z -Lcom/android/internal/telephony/cdma/SmsMessage;->mBearerData:Lcom/android/internal/telephony/cdma/sms/BearerData; -Lcom/android/internal/telephony/cdma/SmsMessage;->mEnvelope:Lcom/android/internal/telephony/cdma/sms/SmsEnvelope; -Lcom/android/internal/telephony/cdma/SmsMessage;->parseSms()V -Lcom/android/internal/telephony/cdma/SmsMessage;->privateGetSubmitPdu(Ljava/lang/String;ZLcom/android/internal/telephony/cdma/sms/UserData;)Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/DctConstants$Activity;->DATAIN:Lcom/android/internal/telephony/DctConstants$Activity; -Lcom/android/internal/telephony/DctConstants$Activity;->DATAINANDOUT:Lcom/android/internal/telephony/DctConstants$Activity; -Lcom/android/internal/telephony/DctConstants$Activity;->DATAOUT:Lcom/android/internal/telephony/DctConstants$Activity; -Lcom/android/internal/telephony/DctConstants$Activity;->DORMANT:Lcom/android/internal/telephony/DctConstants$Activity; -Lcom/android/internal/telephony/DctConstants$Activity;->values()[Lcom/android/internal/telephony/DctConstants$Activity; -Lcom/android/internal/telephony/DctConstants$State;->CONNECTED:Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DctConstants$State;->CONNECTING:Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DctConstants$State;->DISCONNECTING:Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DctConstants$State;->FAILED:Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DctConstants$State;->IDLE:Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DctConstants$State;->RETRYING:Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DctConstants$State;->values()[Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DriverCall$State;->values()[Lcom/android/internal/telephony/DriverCall$State; -Lcom/android/internal/telephony/gsm/GsmCellBroadcastHandler$SmsCbConcatInfo;-><init>(Lcom/android/internal/telephony/gsm/SmsCbHeader;Landroid/telephony/SmsCbLocation;)V -Lcom/android/internal/telephony/gsm/GsmCellBroadcastHandler$SmsCbConcatInfo;->matchesLocation(Ljava/lang/String;II)Z -Lcom/android/internal/telephony/gsm/GsmCellBroadcastHandler;->mSmsCbPageMap:Ljava/util/HashMap; -Lcom/android/internal/telephony/gsm/GsmInboundSmsHandler;->acknowledgeLastIncomingSms(ZILandroid/os/Message;)V -Lcom/android/internal/telephony/gsm/GsmMmiCode;-><init>(Lcom/android/internal/telephony/GsmCdmaPhone;Lcom/android/internal/telephony/uicc/UiccCardApplication;)V -Lcom/android/internal/telephony/gsm/GsmMmiCode;->getCLIRMode()I -Lcom/android/internal/telephony/gsm/GsmMmiCode;->getScString()Ljava/lang/CharSequence; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isActivate()Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isDeactivate()Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isErasure()Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isInterrogate()Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isRegister()Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isServiceCodeCallBarring(Ljava/lang/String;)Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isServiceCodeCallForwarding(Ljava/lang/String;)Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->isTemporaryModeCLIR()Z -Lcom/android/internal/telephony/gsm/GsmMmiCode;->makeEmptyNull(Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mDialingNumber:Ljava/lang/String; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mIccRecords:Lcom/android/internal/telephony/uicc/IccRecords; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mPhone:Lcom/android/internal/telephony/GsmCdmaPhone; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mSc:Ljava/lang/String; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mSia:Ljava/lang/String; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mSib:Ljava/lang/String; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->mSic:Ljava/lang/String; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->newFromDialString(Ljava/lang/String;Lcom/android/internal/telephony/GsmCdmaPhone;Lcom/android/internal/telephony/uicc/UiccCardApplication;)Lcom/android/internal/telephony/gsm/GsmMmiCode; -Lcom/android/internal/telephony/gsm/GsmMmiCode;->processCode()V -Lcom/android/internal/telephony/gsm/GsmMmiCode;->siToServiceClass(Ljava/lang/String;)I -Lcom/android/internal/telephony/gsm/GsmMmiCode;->sPatternSuppService:Ljava/util/regex/Pattern; -Lcom/android/internal/telephony/gsm/GsmSmsAddress;-><init>([BII)V -Lcom/android/internal/telephony/gsm/GsmSmsAddress;->isCphsVoiceMessageClear()Z -Lcom/android/internal/telephony/gsm/GsmSmsAddress;->isCphsVoiceMessageSet()Z -Lcom/android/internal/telephony/gsm/GsmSMSDispatcher;->getFormat()Ljava/lang/String; -Lcom/android/internal/telephony/gsm/GsmSMSDispatcher;->mGsmInboundSmsHandler:Lcom/android/internal/telephony/gsm/GsmInboundSmsHandler; -Lcom/android/internal/telephony/gsm/GsmSMSDispatcher;->sendSms(Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/gsm/SimTlv;-><init>([BII)V -Lcom/android/internal/telephony/gsm/SimTlv;->getData()[B -Lcom/android/internal/telephony/gsm/SimTlv;->getTag()I -Lcom/android/internal/telephony/gsm/SimTlv;->isValidObject()Z -Lcom/android/internal/telephony/gsm/SimTlv;->mHasValidTlvObject:Z -Lcom/android/internal/telephony/gsm/SimTlv;->nextObject()Z -Lcom/android/internal/telephony/gsm/SmsCbHeader;-><init>([B)V -Lcom/android/internal/telephony/gsm/SmsCbHeader;->getGeographicalScope()I -Lcom/android/internal/telephony/gsm/SmsCbHeader;->getNumberOfPages()I -Lcom/android/internal/telephony/gsm/SmsCbHeader;->getPageIndex()I -Lcom/android/internal/telephony/gsm/SmsCbHeader;->getSerialNumber()I -Lcom/android/internal/telephony/gsm/SmsCbHeader;->getServiceCategory()I -Lcom/android/internal/telephony/gsm/SmsCbHeader;->mMessageIdentifier:I -Lcom/android/internal/telephony/gsm/SmsMessage$PduParser;-><init>([B)V -Lcom/android/internal/telephony/gsm/SmsMessage$PduParser;->getByte()I -Lcom/android/internal/telephony/gsm/SmsMessage$PduParser;->getUserData()[B -Lcom/android/internal/telephony/gsm/SmsMessage$PduParser;->getUserDataUCS2(I)Ljava/lang/String; -Lcom/android/internal/telephony/gsm/SmsMessage$PduParser;->mCur:I -Lcom/android/internal/telephony/gsm/SmsMessage$PduParser;->mPdu:[B -Lcom/android/internal/telephony/gsm/SmsMessage$PduParser;->mUserDataSeptetPadding:I -Lcom/android/internal/telephony/gsm/SmsMessage$SubmitPdu;-><init>()V -Lcom/android/internal/telephony/gsm/SmsMessage;-><init>()V -Lcom/android/internal/telephony/gsm/SmsMessage;->calculateLength(Ljava/lang/CharSequence;Z)Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails; -Lcom/android/internal/telephony/gsm/SmsMessage;->createFromEfRecord(I[B)Lcom/android/internal/telephony/gsm/SmsMessage; -Lcom/android/internal/telephony/gsm/SmsMessage;->createFromPdu([B)Lcom/android/internal/telephony/gsm/SmsMessage; -Lcom/android/internal/telephony/gsm/SmsMessage;->encodeUCS2(Ljava/lang/String;[B)[B -Lcom/android/internal/telephony/gsm/SmsMessage;->getStatus()I -Lcom/android/internal/telephony/gsm/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/internal/telephony/gsm/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/gsm/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Lcom/android/internal/telephony/gsm/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/gsm/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z[B)Lcom/android/internal/telephony/gsm/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/gsm/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z[BIII)Lcom/android/internal/telephony/gsm/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/gsm/SmsMessage;->getSubmitPdu(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z[BIIII)Lcom/android/internal/telephony/gsm/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/gsm/SmsMessage;->getSubmitPduHead(Ljava/lang/String;Ljava/lang/String;BZLcom/android/internal/telephony/gsm/SmsMessage$SubmitPdu;)Ljava/io/ByteArrayOutputStream; -Lcom/android/internal/telephony/gsm/SmsMessage;->isMWIClearMessage()Z -Lcom/android/internal/telephony/gsm/SmsMessage;->isMwiDontStore()Z -Lcom/android/internal/telephony/gsm/SmsMessage;->isMWISetMessage()Z -Lcom/android/internal/telephony/gsm/SmsMessage;->isStatusReportMessage()Z -Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->loadEfFilesFromUsim()Ljava/util/ArrayList; -Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->mFh:Lcom/android/internal/telephony/uicc/IccFileHandler; -Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->mPhoneBookRecords:Ljava/util/ArrayList; -Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->reset()V -Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;-><init>()V -Lcom/android/internal/telephony/GsmCdmaConnection$MyHandler;-><init>(Lcom/android/internal/telephony/GsmCdmaConnection;Landroid/os/Looper;)V -Lcom/android/internal/telephony/IccCardConstants$State;->ABSENT:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->CARD_IO_ERROR:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->NETWORK_LOCKED:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->NOT_READY:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->PERM_DISABLED:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->PIN_REQUIRED:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->PUK_REQUIRED:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->READY:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->UNKNOWN:Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCardConstants$State;->values()[Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccProvider;-><init>()V Lcom/android/internal/telephony/IIccPhoneBook$Stub$Proxy;->mRemote:Landroid/os/IBinder; Lcom/android/internal/telephony/IIccPhoneBook$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IIccPhoneBook; -Lcom/android/internal/telephony/IIccPhoneBook;->getAdnRecordsInEf(I)Ljava/util/List; -Lcom/android/internal/telephony/IIccPhoneBook;->getAdnRecordsInEfForSubscriber(II)Ljava/util/List; -Lcom/android/internal/telephony/IIccPhoneBook;->getAdnRecordsSize(I)[I -Lcom/android/internal/telephony/IIccPhoneBook;->getAdnRecordsSizeForSubscriber(II)[I -Lcom/android/internal/telephony/IIccPhoneBook;->updateAdnRecordsInEfBySearch(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z Lcom/android/internal/telephony/IMms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IMms; -Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker$ExternalCallStateListener;-><init>(Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker;)V -Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker$ExternalConnectionListener;-><init>(Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->notifyCallForwardingIndicator()V -Lcom/android/internal/telephony/imsphone/ImsPhone;->notifyPreciseCallStateChanged()V -Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->getImsCall()Lcom/android/ims/ImsCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->findConnection(Lcom/android/ims/ImsCall;)Lcom/android/internal/telephony/imsphone/ImsPhoneConnection; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->getEcbmInterface()Lcom/android/ims/ImsEcbm; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mCallExpectedToResume:Lcom/android/ims/ImsCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mImsCallListener:Lcom/android/ims/ImsCall$Listener; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mImsManager:Lcom/android/ims/ImsManager; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mUssdSession:Lcom/android/ims/ImsCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->processCallStateChange(Lcom/android/ims/ImsCall;Lcom/android/internal/telephony/Call$State;I)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->processCallStateChange(Lcom/android/ims/ImsCall;Lcom/android/internal/telephony/Call$State;IZ)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->setVideoCallProvider(Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;Lcom/android/ims/ImsCall;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection$MyHandler;-><init>(Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;Landroid/os/Looper;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->mImsCall:Lcom/android/ims/ImsCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->update(Lcom/android/ims/ImsCall;Lcom/android/internal/telephony/Call$State;)Z -Lcom/android/internal/telephony/InboundSmsHandler$SmsBroadcastReceiver;-><init>(Lcom/android/internal/telephony/InboundSmsHandler;Lcom/android/internal/telephony/InboundSmsTracker;)V Lcom/android/internal/telephony/IPhoneStateListener$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneStateListener; Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; @@ -1380,92 +1057,9 @@ Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_getDeviceId:I Lcom/android/internal/telephony/ITelephonyRegistry$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephonyRegistry; Lcom/android/internal/telephony/IWapPushManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IWapPushManager; -Lcom/android/internal/telephony/PhoneConstants$DataState;->CONNECTED:Lcom/android/internal/telephony/PhoneConstants$DataState; -Lcom/android/internal/telephony/PhoneConstants$DataState;->CONNECTING:Lcom/android/internal/telephony/PhoneConstants$DataState; -Lcom/android/internal/telephony/PhoneConstants$DataState;->DISCONNECTED:Lcom/android/internal/telephony/PhoneConstants$DataState; -Lcom/android/internal/telephony/PhoneConstants$DataState;->SUSPENDED:Lcom/android/internal/telephony/PhoneConstants$DataState; -Lcom/android/internal/telephony/PhoneConstants$DataState;->values()[Lcom/android/internal/telephony/PhoneConstants$DataState; -Lcom/android/internal/telephony/PhoneConstants$State;->IDLE:Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/PhoneConstants$State;->OFFHOOK:Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/PhoneConstants$State;->RINGING:Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/PhoneConstants$State;->values()[Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_ALLOWED:I -Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_PAYPHONE:I -Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_RESTRICTED:I -Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_UNKNOWN:I -Lcom/android/internal/telephony/RILConstants;->PREFERRED_NETWORK_MODE:I -Lcom/android/internal/telephony/sip/SipPhone$SipCall;->hold()V -Lcom/android/internal/telephony/sip/SipPhone$SipCall;->switchWith(Lcom/android/internal/telephony/sip/SipPhone$SipCall;)V -Lcom/android/internal/telephony/sip/SipPhone$SipCall;->unhold()V -Lcom/android/internal/telephony/sip/SipPhone;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/sip/SipPhone;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/sip/SipPhone;->mBackgroundCall:Lcom/android/internal/telephony/sip/SipPhone$SipCall; -Lcom/android/internal/telephony/sip/SipPhone;->mForegroundCall:Lcom/android/internal/telephony/sip/SipPhone$SipCall; -Lcom/android/internal/telephony/Sms7BitEncodingTranslator;->DBG:Z -Lcom/android/internal/telephony/Sms7BitEncodingTranslator;->mTranslationTableCDMA:Landroid/util/SparseIntArray; -Lcom/android/internal/telephony/Sms7BitEncodingTranslator;->mTranslationTableCommon:Landroid/util/SparseIntArray; -Lcom/android/internal/telephony/Sms7BitEncodingTranslator;->mTranslationTableGSM:Landroid/util/SparseIntArray; -Lcom/android/internal/telephony/SmsApplication$SmsApplicationData;->mApplicationName:Ljava/lang/String; -Lcom/android/internal/telephony/SmsApplication;->configurePreferredActivity(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;I)V -Lcom/android/internal/telephony/SmsApplication;->getApplicationCollection(Landroid/content/Context;)Ljava/util/Collection; -Lcom/android/internal/telephony/SmsApplication;->getDefaultMmsApplication(Landroid/content/Context;Z)Landroid/content/ComponentName; -Lcom/android/internal/telephony/SmsApplication;->getDefaultRespondViaMessageApplication(Landroid/content/Context;Z)Landroid/content/ComponentName; -Lcom/android/internal/telephony/SmsApplication;->getDefaultSmsApplication(Landroid/content/Context;Z)Landroid/content/ComponentName; -Lcom/android/internal/telephony/SmsApplication;->getSmsApplicationData(Ljava/lang/String;Landroid/content/Context;)Lcom/android/internal/telephony/SmsApplication$SmsApplicationData; -Lcom/android/internal/telephony/SmsApplication;->isDefaultSmsApplication(Landroid/content/Context;Ljava/lang/String;)Z -Lcom/android/internal/telephony/SmsApplication;->setDefaultApplication(Ljava/lang/String;Landroid/content/Context;)V -Lcom/android/internal/telephony/SmsApplication;->shouldWriteMessageForPackage(Ljava/lang/String;Landroid/content/Context;)Z -Lcom/android/internal/telephony/SMSDispatcher$DataSmsSender;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSender;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Ljava/util/ArrayList;[Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSenderCallback;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSender;)V -Lcom/android/internal/telephony/SMSDispatcher$SmsSenderCallback;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$SmsSender;)V -Lcom/android/internal/telephony/SMSDispatcher$TextSmsSender;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SmsHeader$ConcatRef;-><init>()V -Lcom/android/internal/telephony/SmsHeader$PortAddrs;-><init>()V -Lcom/android/internal/telephony/SmsMessageBase;-><init>()V -Lcom/android/internal/telephony/TelephonyProperties;->PROPERTY_ICC_OPERATOR_NUMERIC:Ljava/lang/String; -Lcom/android/internal/telephony/test/InterpreterEx;-><init>(Ljava/lang/String;)V -Lcom/android/internal/telephony/test/SimulatedCommands;->acceptCall(Landroid/os/Message;)V -Lcom/android/internal/telephony/test/SimulatedCommands;->mDcSuccess:Z -Lcom/android/internal/telephony/test/SimulatedCommands;->resultFail(Landroid/os/Message;Ljava/lang/Object;Ljava/lang/Throwable;)V -Lcom/android/internal/telephony/test/SimulatedCommands;->resultSuccess(Landroid/os/Message;Ljava/lang/Object;)V -Lcom/android/internal/telephony/test/SimulatedCommands;->simulatedCallState:Lcom/android/internal/telephony/test/SimulatedGsmCallState; -Lcom/android/internal/telephony/test/SimulatedCommands;->unimplemented(Landroid/os/Message;)V -Lcom/android/internal/telephony/test/SimulatedCommandsVerifier;->getInstance()Lcom/android/internal/telephony/test/SimulatedCommandsVerifier; -Lcom/android/internal/telephony/test/SimulatedCommandsVerifier;->setCallForward(IIILjava/lang/String;ILandroid/os/Message;)V -Lcom/android/internal/telephony/test/SimulatedGsmCallState;->conference()Z -Lcom/android/internal/telephony/test/SimulatedGsmCallState;->onChld(CC)Z -Lcom/android/internal/telephony/test/SimulatedGsmCallState;->releaseActiveAcceptHeldOrWaiting()Z -Lcom/android/internal/telephony/test/SimulatedGsmCallState;->releaseHeldOrUDUB()Z -Lcom/android/internal/telephony/test/SimulatedGsmCallState;->separateCall(I)Z -Lcom/android/internal/telephony/test/SimulatedGsmCallState;->switchActiveAndHeldOrWaiting()Z -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->values()[Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->values()[Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->values()[Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus;-><init>()V -Lcom/android/internal/telephony/uicc/IccRefreshResponse;-><init>()V -Lcom/android/internal/telephony/uicc/IccUtils;->adnStringFieldToString([BII)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccUtils;->bcdToString([BII)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccUtils;->bytesToHexString([B)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccUtils;->cdmaBcdByteToInt(B)I -Lcom/android/internal/telephony/uicc/IccUtils;->cdmaBcdToString([BII)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccUtils;->gsmBcdByteToInt(B)I -Lcom/android/internal/telephony/uicc/IccUtils;->hexCharToInt(C)I -Lcom/android/internal/telephony/uicc/IccUtils;->hexStringToBytes(Ljava/lang/String;)[B -Lcom/android/internal/telephony/uicc/IccUtils;->networkNameToString([BII)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccUtils;->parseToBnW([BI)Landroid/graphics/Bitmap; -Lcom/android/internal/telephony/uicc/IccUtils;->parseToRGB([BIZ)Landroid/graphics/Bitmap; -Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState;->values()[Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState; Lcom/android/internal/textservice/ITextServicesManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/util/MemInfoReader;-><init>()V Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/view/IInputMethodManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodManager; Lcom/android/internal/view/IInputMethodSession$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodSession; Lcom/android/internal/widget/ILockSettings$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/widget/ILockSettings; Lcom/android/internal/widget/IRemoteViewsFactory$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/widget/IRemoteViewsFactory; -Lcom/android/internal/widget/PointerLocationView$PointerState;-><init>()V -Lcom/android/server/net/BaseNetworkObserver;-><init>()V -Lcom/android/server/ResettableTimeout$T;-><init>(Lcom/android/server/ResettableTimeout;)V -Lcom/google/android/gles_jni/EGLImpl;-><init>()V -Lcom/google/android/gles_jni/GLImpl;-><init>()V -Lcom/google/android/util/AbstractMessageParser$Token$Type;->values()[Lcom/google/android/util/AbstractMessageParser$Token$Type; diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index f4e465ab3adb..2d7adf3cfef2 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -2257,6 +2257,8 @@ public class AccountManager { } private abstract class AmsTask extends FutureTask<Bundle> implements AccountManagerFuture<Bundle> { + + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final IAccountManagerResponse mResponse; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/core/java/android/animation/FloatEvaluator.java b/core/java/android/animation/FloatEvaluator.java index 9463aa12d116..ae90e37d4c71 100644 --- a/core/java/android/animation/FloatEvaluator.java +++ b/core/java/android/animation/FloatEvaluator.java @@ -24,7 +24,7 @@ public class FloatEvaluator implements TypeEvaluator<Number> { /** * This function returns the result of linearly interpolating the start and end values, with * <code>fraction</code> representing the proportion between the start and end values. The - * calculation is a simple parametric calculation: <code>result = x0 + t * (v1 - v0)</code>, + * calculation is a simple parametric calculation: <code>result = x0 + t * (x1 - x0)</code>, * where <code>x0</code> is <code>startValue</code>, <code>x1</code> is <code>endValue</code>, * and <code>t</code> is <code>fraction</code>. * diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index 37509e18ba6f..607ef185ae60 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -25,6 +25,11 @@ import android.os.IBinder; */ @Deprecated public abstract class ActivityManagerNative { + + @UnsupportedAppUsage + public ActivityManagerNative() { + } + /** * Cast a Binder object into an activity manager interface, generating * a proxy if needed. diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index f0dcc51c746a..4e8bee24052e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -714,6 +714,9 @@ public final class ActivityThread extends ClientTransactionHandler { static final class CreateServiceData { @UnsupportedAppUsage + CreateServiceData() { + } + @UnsupportedAppUsage IBinder token; @UnsupportedAppUsage ServiceInfo info; @@ -755,6 +758,9 @@ public final class ActivityThread extends ClientTransactionHandler { static final class AppBindData { @UnsupportedAppUsage + AppBindData() { + } + @UnsupportedAppUsage LoadedApk info; @UnsupportedAppUsage String processName; diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 48ca71690a1b..feaddda044c4 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -122,6 +122,7 @@ interface IActivityManager { in String resultData, in Bundle map, in String[] requiredPermissions, int appOp, in Bundle options, boolean serialized, boolean sticky, int userId); void unbroadcastIntent(in IApplicationThread caller, in Intent intent, int userId); + @UnsupportedAppUsage oneway void finishReceiver(in IBinder who, int resultCode, in String resultData, in Bundle map, boolean abortBroadcast, int flags); void attachApplication(in IApplicationThread app, long startSeq); @@ -211,6 +212,7 @@ interface IActivityManager { @UnsupportedAppUsage ParceledListSlice getRecentTasks(int maxNum, int flags, int userId); + @UnsupportedAppUsage oneway void serviceDoneExecuting(in IBinder token, int type, int startId, int res); @UnsupportedAppUsage IIntentSender getIntentSender(int type, in String packageName, in IBinder token, diff --git a/core/java/android/app/IUiModeManager.aidl b/core/java/android/app/IUiModeManager.aidl index cae54b6c0611..f2c9f615c03f 100644 --- a/core/java/android/app/IUiModeManager.aidl +++ b/core/java/android/app/IUiModeManager.aidl @@ -30,6 +30,7 @@ interface IUiModeManager { /** * Disables the car mode. */ + @UnsupportedAppUsage(maxTargetSdk = 28) void disableCarMode(int flags); /** diff --git a/core/java/android/app/PackageDeleteObserver.java b/core/java/android/app/PackageDeleteObserver.java index 20ae84ca8c39..b7b0b192e7ae 100644 --- a/core/java/android/app/PackageDeleteObserver.java +++ b/core/java/android/app/PackageDeleteObserver.java @@ -22,6 +22,11 @@ import android.content.pm.IPackageDeleteObserver2; /** {@hide} */ public class PackageDeleteObserver { + + @UnsupportedAppUsage + public PackageDeleteObserver() { + } + private final IPackageDeleteObserver2.Stub mBinder = new IPackageDeleteObserver2.Stub() { @Override public void onUserActionRequired(Intent intent) { diff --git a/core/java/android/app/PackageInstallObserver.java b/core/java/android/app/PackageInstallObserver.java index 507ebe566d46..50031e0e4d35 100644 --- a/core/java/android/app/PackageInstallObserver.java +++ b/core/java/android/app/PackageInstallObserver.java @@ -23,6 +23,11 @@ import android.os.Bundle; /** {@hide} */ public class PackageInstallObserver { + + @UnsupportedAppUsage + public PackageInstallObserver() { + } + private final IPackageInstallObserver2.Stub mBinder = new IPackageInstallObserver2.Stub() { @Override public void onUserActionRequired(Intent intent) { diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index 40cb29fc80ab..e9ae60f23cf2 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -145,6 +145,9 @@ public class ResourcesManager { * Resources and base configuration override associated with an Activity. */ private static class ActivityResources { + @UnsupportedAppUsage + private ActivityResources() { + } public final Configuration overrideConfig = new Configuration(); public final ArrayList<WeakReference<Resources>> activityResources = new ArrayList<>(); } @@ -164,6 +167,10 @@ public class ResourcesManager { mAdjustedDisplays = new ArrayMap<>(); @UnsupportedAppUsage + public ResourcesManager() { + } + + @UnsupportedAppUsage public static ResourcesManager getInstance() { synchronized (ResourcesManager.class) { if (sResourcesManager == null) { diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index a6f4d4387069..2301b0e0b68f 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -173,6 +173,7 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccCardManager; import android.telephony.euicc.EuiccManager; +import android.telephony.ims.ImsManager; import android.telephony.ims.RcsMessageManager; import android.util.ArrayMap; import android.util.Log; @@ -630,6 +631,14 @@ final class SystemServiceRegistry { } }); + registerService(Context.TELEPHONY_IMS_SERVICE, ImsManager.class, + new CachedServiceFetcher<ImsManager>() { + @Override + public ImsManager createService(ContextImpl ctx) { + return new ImsManager(ctx.getOuterContext()); + } + }); + registerService(Context.CARRIER_CONFIG_SERVICE, CarrierConfigManager.class, new CachedServiceFetcher<CarrierConfigManager>() { @Override diff --git a/core/java/android/app/TaskStackListener.java b/core/java/android/app/TaskStackListener.java index b4b7df970493..50130400deab 100644 --- a/core/java/android/app/TaskStackListener.java +++ b/core/java/android/app/TaskStackListener.java @@ -30,6 +30,11 @@ import android.os.RemoteException; * @hide */ public abstract class TaskStackListener extends ITaskStackListener.Stub { + + @UnsupportedAppUsage + public TaskStackListener() { + } + @Override @UnsupportedAppUsage public void onTaskStackChanged() throws RemoteException { diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java index dc07df8d7a87..f251b3eb4a15 100644 --- a/core/java/android/app/UiAutomationConnection.java +++ b/core/java/android/app/UiAutomationConnection.java @@ -40,6 +40,8 @@ import android.view.WindowContentFrameStats; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.IAccessibilityManager; +import dalvik.annotation.compat.UnsupportedAppUsage; + import libcore.io.IoUtils; import java.io.FileInputStream; @@ -87,6 +89,10 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { private int mOwningUid; + @UnsupportedAppUsage + public UiAutomationConnection() { + } + @Override public void connect(IAccessibilityServiceClient client, int flags) { if (client == null) { diff --git a/core/java/android/app/UserSwitchObserver.java b/core/java/android/app/UserSwitchObserver.java index 25b243d95fa1..2f8ee744bfd6 100644 --- a/core/java/android/app/UserSwitchObserver.java +++ b/core/java/android/app/UserSwitchObserver.java @@ -24,6 +24,11 @@ import android.os.RemoteException; * @hide */ public class UserSwitchObserver extends IUserSwitchObserver.Stub { + + @UnsupportedAppUsage + public UserSwitchObserver() { + } + @Override public void onUserSwitching(int newUserId, IRemoteCallback reply) throws RemoteException { if (reply != null) { diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index e7ba85ad5d9e..566b38738dc1 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -1189,13 +1189,11 @@ public final class BluetoothAdapter { /** * Factory reset bluetooth settings. * - * <p>Requires the {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED} - * permission - * * @return true to indicate that the config file was successfully cleared * @hide */ - @UnsupportedAppUsage + @SystemApi + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean factoryReset() { try { mServiceLock.readLock().lock(); @@ -1214,13 +1212,12 @@ public final class BluetoothAdapter { /** * Get the UUIDs supported by the local Bluetooth adapter. * - * <p>Requires {@link android.Manifest.permission#BLUETOOTH} - * * @return the UUIDs supported by the local Bluetooth Adapter. * @hide */ @UnsupportedAppUsage - public ParcelUuid[] getUuids() { + @RequiresPermission(Manifest.permission.BLUETOOTH) + public @NonNull ParcelUuid[] getUuids() { if (getState() != STATE_ON) { return null; } @@ -1476,7 +1473,6 @@ public final class BluetoothAdapter { * will return false. After turning on Bluetooth, * wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON} * to get the updated value. - * <p>Requires {@link android.Manifest.permission#WRITE_SECURE_SETTINGS} * <p>Applications cannot set the scan mode. They should use * <code>startActivityForResult( * BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE}) @@ -1488,8 +1484,8 @@ public final class BluetoothAdapter { * @return true if the scan mode was set, false otherwise * @hide */ - @UnsupportedAppUsage(publicAlternatives = "Use {@link #ACTION_REQUEST_DISCOVERABLE}, which " - + "shows UI that confirms the user wants to go into discoverable mode.") + @SystemApi + @RequiresPermission(Manifest.permission.BLUETOOTH) public boolean setScanMode(@ScanMode int mode, int duration) { if (getState() != STATE_ON) { return false; @@ -1507,9 +1503,34 @@ public final class BluetoothAdapter { return false; } - /** @hide */ - @UnsupportedAppUsage - public boolean setScanMode(int mode) { + /** + * Set the Bluetooth scan mode of the local Bluetooth adapter. + * <p>The Bluetooth scan mode determines if the local adapter is + * connectable and/or discoverable from remote Bluetooth devices. + * <p>For privacy reasons, discoverable mode is automatically turned off + * after <code>duration</code> seconds. For example, 120 seconds should be + * enough for a remote device to initiate and complete its discovery + * process. + * <p>Valid scan mode values are: + * {@link #SCAN_MODE_NONE}, + * {@link #SCAN_MODE_CONNECTABLE}, + * {@link #SCAN_MODE_CONNECTABLE_DISCOVERABLE}. + * <p>If Bluetooth state is not {@link #STATE_ON}, this API + * will return false. After turning on Bluetooth, + * wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON} + * to get the updated value. + * <p>Applications cannot set the scan mode. They should use + * <code>startActivityForResult( + * BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE}) + * </code>instead. + * + * @param mode valid scan mode + * @return true if the scan mode was set, false otherwise + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.BLUETOOTH) + public boolean setScanMode(@ScanMode int mode) { if (getState() != STATE_ON) { return false; } @@ -1562,6 +1583,8 @@ public final class BluetoothAdapter { * been called recently. * @hide */ + @SystemApi + @RequiresPermission(Manifest.permission.BLUETOOTH) public long getDiscoveryEndMillis() { try { mServiceLock.readLock().lock(); @@ -2060,7 +2083,7 @@ public final class BluetoothAdapter { * BluetoothProfile}. * @hide */ - public List<Integer> getSupportedProfiles() { + public @NonNull List<Integer> getSupportedProfiles() { final ArrayList<Integer> supportedProfiles = new ArrayList<Integer>(); try { diff --git a/core/java/android/companion/ICompanionDeviceDiscoveryServiceCallback.aidl b/core/java/android/companion/ICompanionDeviceDiscoveryServiceCallback.aidl index 5f73e551d57c..c9dc019bd2f2 100644 --- a/core/java/android/companion/ICompanionDeviceDiscoveryServiceCallback.aidl +++ b/core/java/android/companion/ICompanionDeviceDiscoveryServiceCallback.aidl @@ -18,6 +18,8 @@ package android.companion; /** @hide */ interface ICompanionDeviceDiscoveryServiceCallback { + @UnsupportedAppUsage oneway void onDeviceSelected(String packageName, int userId, String deviceAddress); + @UnsupportedAppUsage oneway void onDeviceSelectionCancel(); } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 9f548e861b46..d1cc0868b174 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4734,6 +4734,13 @@ public abstract class Context { /** * Use with {@link #getSystemService(String)} to retrieve an + * {@link android.telephony.ims.ImsManager}. + * @hide + */ + public static final String TELEPHONY_IMS_SERVICE = "telephony_ims"; + + /** + * Use with {@link #getSystemService(String)} to retrieve an * {@link android.telephony.ims.RcsMessageManager}. * @hide */ diff --git a/core/java/android/content/SyncStats.java b/core/java/android/content/SyncStats.java index 03b2250edee1..9596a6016c44 100644 --- a/core/java/android/content/SyncStats.java +++ b/core/java/android/content/SyncStats.java @@ -58,7 +58,7 @@ public class SyncStats implements Parcelable { * attempted to update or delete a version of a resource on the server. This is expected * to clear itself automatically once the new state is retrieved from the server, * though it may remain until the user intervenes manually, perhaps by clearing the - * local storage and starting over frmo scratch. This is considered a hard error. + * local storage and starting over from scratch. This is considered a hard error. */ public long numConflictDetectedExceptions; diff --git a/core/java/android/content/UndoManager.java b/core/java/android/content/UndoManager.java index f6a0d771bf4c..f9c58d624a2f 100644 --- a/core/java/android/content/UndoManager.java +++ b/core/java/android/content/UndoManager.java @@ -18,8 +18,6 @@ package android.content; import android.annotation.UnsupportedAppUsage; import android.os.Parcel; -import android.os.Parcelable; -import android.os.ParcelableParcel; import android.text.TextUtils; import android.util.ArrayMap; @@ -88,6 +86,10 @@ public class UndoManager { public static final int MERGE_MODE_ANY = 2; @UnsupportedAppUsage + public UndoManager() { + } + + @UnsupportedAppUsage public UndoOwner getOwner(String tag, Object data) { if (tag == null) { throw new NullPointerException("tag can't be null"); diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 0aff881ad6db..a81d7ec915d4 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -620,21 +620,6 @@ public class PackageParser { } /** - * Generate and return the {@link PackageInfo} for a parsed package. - * - * @param p the parsed package. - * @param flags indicating which optional information is included. - */ - @UnsupportedAppUsage - public static PackageInfo generatePackageInfo(PackageParser.Package p, - int gids[], int flags, long firstInstallTime, long lastUpdateTime, - Set<String> grantedPermissions, PackageUserState state) { - - return generatePackageInfo(p, gids, flags, firstInstallTime, lastUpdateTime, - grantedPermissions, state, UserHandle.getCallingUserId()); - } - - /** * Returns true if the package is installed and not hidden, or if the caller * explicitly wanted all uninstalled and hidden packages as well. * @param appInfo The applicationInfo of the app being checked. @@ -660,8 +645,45 @@ public class PackageParser { return checkUseInstalledOrHidden(0, state, null); } + /** + * Generate and return the {@link PackageInfo} for a parsed package. + * + * @param p the parsed package. + * @param flags indicating which optional information is included. + */ + @UnsupportedAppUsage + public static PackageInfo generatePackageInfo(PackageParser.Package p, + int[] gids, int flags, long firstInstallTime, long lastUpdateTime, + Set<String> grantedPermissions, PackageUserState state) { + + return generatePackageInfo(p, gids, flags, firstInstallTime, lastUpdateTime, + grantedPermissions, state, UserHandle.getCallingUserId()); + } + @UnsupportedAppUsage public static PackageInfo generatePackageInfo(PackageParser.Package p, + int[] gids, int flags, long firstInstallTime, long lastUpdateTime, + Set<String> grantedPermissions, PackageUserState state, int userId) { + + return generatePackageInfo(p, null, gids, flags, firstInstallTime, lastUpdateTime, + grantedPermissions, state, userId); + } + + /** + * PackageInfo generator specifically for apex files. + * + * @param pkg Package to generate info from. Should be derived from an apex. + * @param apexInfo Apex info relating to the package. + * @return PackageInfo + * @throws PackageParserException + */ + public static PackageInfo generatePackageInfo( + PackageParser.Package pkg, ApexInfo apexInfo, int flags) { + return generatePackageInfo(pkg, apexInfo, EmptyArray.INT, flags, 0, 0, + Collections.emptySet(), new PackageUserState(), UserHandle.getCallingUserId()); + } + + private static PackageInfo generatePackageInfo(PackageParser.Package p, ApexInfo apexInfo, int gids[], int flags, long firstInstallTime, long lastUpdateTime, Set<String> grantedPermissions, PackageUserState state, int userId) { if (!checkUseInstalledOrHidden(flags, state, p.applicationInfo) || !p.isMatch(flags)) { @@ -808,8 +830,27 @@ public class PackageParser { } } } + + if (apexInfo != null) { + File apexFile = new File(apexInfo.modulePath); + + pi.applicationInfo.sourceDir = apexFile.getPath(); + pi.applicationInfo.publicSourceDir = apexFile.getPath(); + if (apexInfo.isFactory) { + pi.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM; + } else { + pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_SYSTEM; + } + if (apexInfo.isActive) { + pi.applicationInfo.flags |= ApplicationInfo.FLAG_INSTALLED; + } else { + pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_INSTALLED; + } + pi.isApex = true; + } + // deprecated method of getting signing certificates - if ((flags&PackageManager.GET_SIGNATURES) != 0) { + if ((flags & PackageManager.GET_SIGNATURES) != 0) { if (p.mSigningDetails.hasPastSigningCertificates()) { // Package has included signing certificate rotation information. Return the oldest // cert so that programmatic checks keep working even if unaware of key rotation. @@ -8397,61 +8438,4 @@ public class PackageParser { } } - // TODO(b/129261524): Clean up API - /** - * PackageInfo parser specifically for apex files. - * NOTE: It will collect certificates - * - * @param apexInfo - * @return PackageInfo - * @throws PackageParserException - */ - public static PackageInfo generatePackageInfoFromApex(ApexInfo apexInfo, int flags) - throws PackageParserException { - PackageParser pp = new PackageParser(); - File apexFile = new File(apexInfo.modulePath); - final Package p = pp.parsePackage(apexFile, flags, false); - PackageUserState state = new PackageUserState(); - PackageInfo pi = generatePackageInfo(p, EmptyArray.INT, flags, 0, 0, - Collections.emptySet(), state); - pi.applicationInfo.sourceDir = apexFile.getPath(); - pi.applicationInfo.publicSourceDir = apexFile.getPath(); - if (apexInfo.isFactory) { - pi.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM; - } else { - pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_SYSTEM; - } - if (apexInfo.isActive) { - pi.applicationInfo.flags |= ApplicationInfo.FLAG_INSTALLED; - } else { - pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_INSTALLED; - } - pi.isApex = true; - - // Collect certificates - if ((flags & PackageManager.GET_SIGNING_CERTIFICATES) != 0) { - collectCertificates(p, apexFile, false); - // Keep legacy mechanism for handling signatures. While this is deprecated, it's - // still part of the public API and needs to be maintained - if (p.mSigningDetails.hasPastSigningCertificates()) { - // Package has included signing certificate rotation information. Return - // the oldest cert so that programmatic checks keep working even if unaware - // of key rotation. - pi.signatures = new Signature[1]; - pi.signatures[0] = p.mSigningDetails.pastSigningCertificates[0]; - } else if (p.mSigningDetails.hasSignatures()) { - // otherwise keep old behavior - int numberOfSigs = p.mSigningDetails.signatures.length; - pi.signatures = new Signature[numberOfSigs]; - System.arraycopy(p.mSigningDetails.signatures, 0, pi.signatures, 0, numberOfSigs); - } - if (p.mSigningDetails != SigningDetails.UNKNOWN) { - // only return a valid SigningInfo if there is signing information to report - pi.signingInfo = new SigningInfo(p.mSigningDetails); - } else { - pi.signingInfo = null; - } - } - return pi; - } } diff --git a/core/java/android/content/res/ConfigurationBoundResourceCache.java b/core/java/android/content/res/ConfigurationBoundResourceCache.java index 3af395a4fc19..848790f46734 100644 --- a/core/java/android/content/res/ConfigurationBoundResourceCache.java +++ b/core/java/android/content/res/ConfigurationBoundResourceCache.java @@ -26,6 +26,11 @@ import android.content.pm.ActivityInfo.Config; * @hide For internal use only. */ public class ConfigurationBoundResourceCache<T> extends ThemedResourceCache<ConstantState<T>> { + + @UnsupportedAppUsage + public ConfigurationBoundResourceCache() { + } + /** * If the resource is cached, creates and returns a new instance of it. * diff --git a/core/java/android/content/res/DrawableCache.java b/core/java/android/content/res/DrawableCache.java index d4f0ca5f8ebf..90604b8d536a 100644 --- a/core/java/android/content/res/DrawableCache.java +++ b/core/java/android/content/res/DrawableCache.java @@ -23,6 +23,11 @@ import android.graphics.drawable.Drawable; * Class which can be used to cache Drawable resources against a theme. */ class DrawableCache extends ThemedResourceCache<Drawable.ConstantState> { + + @UnsupportedAppUsage + DrawableCache() { + } + /** * If the resource is cached, creates and returns a new instance of it. * diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index b79cf6566987..38df317575d7 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -360,8 +360,9 @@ public class TypedArray { /** * Retrieve the boolean value for the attribute at <var>index</var>. * <p> - * If the attribute is an integer value, this method will return whether - * it is equal to zero. If the attribute is not a boolean or integer value, + * If the attribute is an integer value, this method returns false if the + * attribute is equal to zero, and true otherwise. + * If the attribute is not a boolean or integer value, * this method will attempt to coerce it to an integer using * {@link Integer#decode(String)} and return whether it is equal to zero. * diff --git a/core/java/android/database/IContentObserver.aidl b/core/java/android/database/IContentObserver.aidl index 22dc9fed59c4..623556695341 100644 --- a/core/java/android/database/IContentObserver.aidl +++ b/core/java/android/database/IContentObserver.aidl @@ -29,5 +29,6 @@ interface IContentObserver * observed. selfUpdate is true if the update was caused by a call to * commit on the cursor that is being observed. */ + @UnsupportedAppUsage oneway void onChange(boolean selfUpdate, in Uri uri, int userId); } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index cfa3934b0cae..75af41cb2b54 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -1763,6 +1763,10 @@ public class ConnectivityManager { /** @hide */ public static class PacketKeepaliveCallback { + @UnsupportedAppUsage + public PacketKeepaliveCallback() { + } + /** The requested keepalive was successfully started. */ @UnsupportedAppUsage public void onStarted() {} diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 61648dc7f1d8..5f662f914919 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -52,6 +52,7 @@ interface IConnectivityManager @UnsupportedAppUsage NetworkInfo getActiveNetworkInfo(); NetworkInfo getActiveNetworkInfoForUid(int uid, boolean ignoreBlocked); + @UnsupportedAppUsage(maxTargetSdk = 28) NetworkInfo getNetworkInfo(int networkType); NetworkInfo getNetworkInfoForUid(in Network network, int uid, boolean ignoreBlocked); @UnsupportedAppUsage @@ -112,6 +113,7 @@ interface IConnectivityManager int setUsbTethering(boolean enable, String callerPkg); + @UnsupportedAppUsage(maxTargetSdk = 28) void reportInetCondition(int networkType, int percentage); void reportNetworkConnectivity(in Network network, boolean hasConnectivity); diff --git a/core/java/android/net/InterfaceConfiguration.java b/core/java/android/net/InterfaceConfiguration.java index c97b37b55c78..c9a999cfdf17 100644 --- a/core/java/android/net/InterfaceConfiguration.java +++ b/core/java/android/net/InterfaceConfiguration.java @@ -40,6 +40,10 @@ public class InterfaceConfiguration implements Parcelable { private static final String[] EMPTY_STRING_ARRAY = new String[0]; + @UnsupportedAppUsage + public InterfaceConfiguration() { + } + @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 3ec0aeac472b..0706e755d133 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -111,6 +111,8 @@ public final class LinkProperties implements Parcelable { /** * @hide */ + @UnsupportedAppUsage(implicitMember = + "values()[Landroid/net/LinkProperties$ProvisioningChange;") public enum ProvisioningChange { @UnsupportedAppUsage STILL_NOT_PROVISIONED, diff --git a/core/java/android/net/MobileLinkQualityInfo.java b/core/java/android/net/MobileLinkQualityInfo.java index 06c739d6cf95..a10a14d750d8 100644 --- a/core/java/android/net/MobileLinkQualityInfo.java +++ b/core/java/android/net/MobileLinkQualityInfo.java @@ -40,6 +40,10 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { private int mLteRssnr = UNKNOWN_INT; private int mLteCqi = UNKNOWN_INT; + @UnsupportedAppUsage + public MobileLinkQualityInfo() { + } + /** * Implement the Parcelable interface. * @hide diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java index 43ea5891d7f7..ff4bf2d3474c 100644 --- a/core/java/android/net/NetworkAgent.java +++ b/core/java/android/net/NetworkAgent.java @@ -16,6 +16,7 @@ package android.net; +import android.annotation.NonNull; import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Build; @@ -418,7 +419,16 @@ public abstract class NetworkAgent extends Handler { if (score < 0) { throw new IllegalArgumentException("Score must be >= 0"); } - queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, score, 0); + final NetworkScore ns = new NetworkScore(); + ns.putIntExtension(NetworkScore.LEGACY_SCORE, score); + updateScore(ns); + } + + /** + * Called by the bearer code when it has a new NetworkScore for this network. + */ + public void updateScore(@NonNull NetworkScore ns) { + queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, new NetworkScore(ns)); } /** diff --git a/core/java/android/net/NetworkScore.java b/core/java/android/net/NetworkScore.java new file mode 100644 index 000000000000..1ab63352401c --- /dev/null +++ b/core/java/android/net/NetworkScore.java @@ -0,0 +1,157 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.net; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Objects; + +/** + * Object representing the quality of a network as perceived by the user. + * + * A NetworkScore object represents the characteristics of a network that affects how good the + * network is considered for a particular use. + * @hide + */ +public final class NetworkScore implements Parcelable { + + // The key of bundle which is used to get the legacy network score of NetworkAgentInfo. + // TODO: Remove this when the transition to NetworkScore is over. + public static final String LEGACY_SCORE = "LEGACY_SCORE"; + @NonNull + private final Bundle mExtensions; + + public NetworkScore() { + mExtensions = new Bundle(); + } + + public NetworkScore(@NonNull NetworkScore source) { + mExtensions = new Bundle(source.mExtensions); + } + + /** + * Put the value of parcelable inside the bundle by key. + */ + public void putExtension(@Nullable String key, @Nullable Parcelable value) { + mExtensions.putParcelable(key, value); + } + + /** + * Put the value of int inside the bundle by key. + */ + public void putIntExtension(@Nullable String key, int value) { + mExtensions.putInt(key, value); + } + + /** + * Get the value of non primitive type by key. + */ + public <T extends Parcelable> T getExtension(@Nullable String key) { + return mExtensions.getParcelable(key); + } + + /** + * Get the value of int by key. + */ + public int getIntExtension(@Nullable String key) { + return mExtensions.getInt(key); + } + + /** + * Remove the entry by given key. + */ + public void removeExtension(@Nullable String key) { + mExtensions.remove(key); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + synchronized (this) { + dest.writeBundle(mExtensions); + } + } + + public static final @NonNull Creator<NetworkScore> CREATOR = new Creator<NetworkScore>() { + @Override + public NetworkScore createFromParcel(@NonNull Parcel in) { + return new NetworkScore(in); + } + + @Override + public NetworkScore[] newArray(int size) { + return new NetworkScore[size]; + } + }; + + private NetworkScore(@NonNull Parcel in) { + mExtensions = in.readBundle(); + } + + // TODO: Modify this method once new fields are added into this class. + @Override + public boolean equals(@Nullable Object obj) { + if (!(obj instanceof NetworkScore)) { + return false; + } + final NetworkScore other = (NetworkScore) obj; + return bundlesEqual(mExtensions, other.mExtensions); + } + + @Override + public int hashCode() { + int result = 29; + for (String key : mExtensions.keySet()) { + final Object value = mExtensions.get(key); + // The key may be null, so call Objects.hash() is safer. + result += 31 * value.hashCode() + 37 * Objects.hash(key); + } + return result; + } + + // mExtensions won't be null since the constructor will create it. + private boolean bundlesEqual(@NonNull Bundle bundle1, @NonNull Bundle bundle2) { + if (bundle1 == bundle2) { + return true; + } + + // This is unlikely but it's fine to add this clause here. + if (null == bundle1 || null == bundle2) { + return false; + } + + if (bundle1.size() != bundle2.size()) { + return false; + } + + for (String key : bundle1.keySet()) { + final Object value1 = bundle1.get(key); + final Object value2 = bundle2.get(key); + if (!Objects.equals(value1, value2)) { + return false; + } + } + return true; + } +} diff --git a/core/java/android/net/SntpClient.java b/core/java/android/net/SntpClient.java index a55d9d00414f..f9c2defc0377 100644 --- a/core/java/android/net/SntpClient.java +++ b/core/java/android/net/SntpClient.java @@ -78,6 +78,10 @@ public class SntpClient { } } + @UnsupportedAppUsage + public SntpClient() { + } + /** * Sends an SNTP request to the given host and processes the response. * diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java index 535bf675cd0e..64f20b839a63 100644 --- a/core/java/android/net/nsd/NsdManager.java +++ b/core/java/android/net/nsd/NsdManager.java @@ -49,8 +49,8 @@ import java.util.concurrent.CountDownLatch; * limited to a local network over Multicast DNS. DNS service discovery is described at * http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt * - * <p> The API is asynchronous and responses to requests from an application are on listener - * callbacks on a seperate internal thread. + * <p> The API is asynchronous, and responses to requests from an application are on listener + * callbacks on a separate internal thread. * * <p> There are three main operations the API supports - registration, discovery and resolution. * <pre> diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java index d259f386ea77..b37e176ddb6e 100644 --- a/core/java/android/os/AsyncTask.java +++ b/core/java/android/os/AsyncTask.java @@ -38,9 +38,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; /** - * <p>AsyncTask enables proper and easy use of the UI thread. This class allows you - * to perform background operations and publish results on the UI thread without - * having to manipulate threads and/or handlers.</p> + * <p>AsyncTask was intended to enable proper and easy use of the UI thread. However, the most + * common use case was for integrating into UI, and that would cause Context leaks, missed + * callbacks, or crashes on configuration changes. It also has inconsistent behavior on different + * versions of the platform, swallows exceptions from {@code doInBackground}, and does not provide + * much utility over using {@link Executor}s directly.</p> * * <p>AsyncTask is designed to be a helper class around {@link Thread} and {@link Handler} * and does not constitute a generic threading framework. AsyncTasks should ideally be @@ -188,7 +190,12 @@ import java.util.concurrent.atomic.AtomicInteger; * <p>If you truly want parallel execution, you can invoke * {@link #executeOnExecutor(java.util.concurrent.Executor, Object[])} with * {@link #THREAD_POOL_EXECUTOR}.</p> + * + * @deprecated Use the standard <code>java.util.concurrent</code> or + * <a href="https://developer.android.com/topic/libraries/architecture/coroutines"> + * Kotlin concurrency utilities</a> instead. */ +@Deprecated public abstract class AsyncTask<Params, Progress, Result> { private static final String LOG_TAG = "AsyncTask"; @@ -240,7 +247,13 @@ public abstract class AsyncTask<Params, Progress, Result> { /** * An {@link Executor} that can be used to execute tasks in parallel. + * + * @deprecated Using a single thread pool for a general purpose results in suboptimal behavior + * for different tasks. Small, CPU-bound tasks benefit from a bounded pool and queueing, and + * long-running blocking tasks, such as network operations, benefit from many threads. Use or + * create an {@link Executor} configured for your use case. */ + @Deprecated public static final Executor THREAD_POOL_EXECUTOR; static { @@ -254,7 +267,10 @@ public abstract class AsyncTask<Params, Progress, Result> { /** * An {@link Executor} that executes tasks one at a time in serial * order. This serialization is global to a particular process. + * + * @deprecated Globally serializing tasks results in excessive queuing for unrelated operations. */ + @Deprecated public static final Executor SERIAL_EXECUTOR = new SerialExecutor(); private static final int MESSAGE_POST_RESULT = 0x1; diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index ecd16dd1f612..387775b7ccdc 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -66,6 +66,10 @@ import java.util.Map; public abstract class BatteryStats implements Parcelable { private static final String TAG = "BatteryStats"; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public BatteryStats() { + } + private static final boolean LOCAL_LOGV = false; /** Fetching RPM stats is too slow to do each time screen changes, so disable it. */ protected static final boolean SCREEN_OFF_RPM_STATS_ENABLED = false; @@ -407,6 +411,10 @@ public abstract class BatteryStats implements Parcelable { */ public static abstract class Counter { + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public Counter() { + } + /** * Returns the count associated with this Counter for the * selected type of statistics. @@ -516,6 +524,10 @@ public abstract class BatteryStats implements Parcelable { */ public static abstract class Timer { + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public Timer() { + } + /** * Returns the count associated with this Timer for the * selected type of statistics. @@ -631,6 +643,10 @@ public abstract class BatteryStats implements Parcelable { */ public static abstract class Uid { + @UnsupportedAppUsage + public Uid() { + } + /** * Returns a mapping containing wakelock statistics. * @@ -671,6 +687,11 @@ public abstract class BatteryStats implements Parcelable { * The statistics associated with a particular wake lock. */ public static abstract class Wakelock { + + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public Wakelock(){ + } + @UnsupportedAppUsage public abstract Timer getWakeTime(int type); } @@ -948,6 +969,11 @@ public abstract class BatteryStats implements Parcelable { public abstract void getDeferredJobsLineLocked(StringBuilder sb, int which); public static abstract class Sensor { + + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public Sensor() { + } + /* * FIXME: it's not correct to use this magic value because it * could clash with a sensor handle (which are defined by @@ -978,7 +1004,16 @@ public abstract class BatteryStats implements Parcelable { */ public static abstract class Proc { + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public Proc() { + } + public static class ExcessivePower { + + @UnsupportedAppUsage + public ExcessivePower() { + } + public static final int TYPE_WAKE = 1; public static final int TYPE_CPU = 2; @@ -1053,6 +1088,10 @@ public abstract class BatteryStats implements Parcelable { */ public static abstract class Pkg { + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public Pkg() { + } + /** * Returns information about all wakeup alarms that have been triggered for this * package. The mapping keys are tag names for the alarms, the counter contains @@ -1555,6 +1594,7 @@ public abstract class BatteryStats implements Parcelable { } public final static class HistoryItem implements Parcelable { + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public HistoryItem next; // The time of this event in milliseconds, as per SystemClock.elapsedRealtime(). @@ -1877,6 +1917,7 @@ public abstract class BatteryStats implements Parcelable { numReadInts += (src.dataPosition()-start)/4; } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public void clear() { time = 0; cmd = CMD_NULL; @@ -1897,12 +1938,14 @@ public abstract class BatteryStats implements Parcelable { eventTag = null; } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public void setTo(HistoryItem o) { time = o.time; cmd = o.cmd; setToCommon(o); } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public void setTo(long time, byte cmd, HistoryItem o) { this.time = time; this.cmd = cmd; @@ -1958,6 +2001,7 @@ public abstract class BatteryStats implements Parcelable { && currentTime == o.currentTime; } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public boolean same(HistoryItem o) { if (!sameNonEvent(o) || eventCode != o.eventCode) { return false; @@ -2340,6 +2384,7 @@ public abstract class BatteryStats implements Parcelable { * * {@hide} */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public abstract long getMobileRadioActiveTime(long elapsedRealtimeUs, int which); /** @@ -2700,6 +2745,7 @@ public abstract class BatteryStats implements Parcelable { public static final int NETWORK_WIFI_BG_TX_DATA = 9; public static final int NUM_NETWORK_ACTIVITY_TYPES = NETWORK_WIFI_BG_TX_DATA + 1; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public abstract long getNetworkActivityBytes(int type, int which); public abstract long getNetworkActivityPackets(int type, int which); diff --git a/core/java/android/os/CancellationSignal.java b/core/java/android/os/CancellationSignal.java index e8053d5d275d..99fb9982e706 100644 --- a/core/java/android/os/CancellationSignal.java +++ b/core/java/android/os/CancellationSignal.java @@ -18,13 +18,19 @@ package android.os; import android.os.ICancellationSignal; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * Provides the ability to cancel an operation in progress. */ public final class CancellationSignal { + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private boolean mIsCanceled; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private OnCancelListener mOnCancelListener; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private ICancellationSignal mRemote; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private boolean mCancelInProgress; /** @@ -152,6 +158,7 @@ public final class CancellationSignal { } } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private void waitForCancelFinishedLocked() { while (mCancelInProgress) { try { diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 154e8cd5a2d5..4ed7b17d1549 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -1690,6 +1690,8 @@ public final class Debug * such runtime statistic exists. * * <p>The following table lists the runtime statistics that the runtime supports. + * All statistics are approximate. Individual allocations may not be immediately reflected + * in the results. * Note runtime statistics may be added or removed in a future API level.</p> * * <table> diff --git a/core/java/android/os/IDeviceIdleController.aidl b/core/java/android/os/IDeviceIdleController.aidl index aa255bf660d5..8a7a594f0b80 100644 --- a/core/java/android/os/IDeviceIdleController.aidl +++ b/core/java/android/os/IDeviceIdleController.aidl @@ -31,11 +31,13 @@ interface IDeviceIdleController { String[] getSystemPowerWhitelistExceptIdle(); String[] getSystemPowerWhitelist(); String[] getUserPowerWhitelist(); + @UnsupportedAppUsage String[] getFullPowerWhitelistExceptIdle(); String[] getFullPowerWhitelist(); int[] getAppIdWhitelistExceptIdle(); int[] getAppIdWhitelist(); int[] getAppIdUserWhitelist(); + @UnsupportedAppUsage int[] getAppIdTempWhitelist(); boolean isPowerSaveWhitelistExceptIdleApp(String name); boolean isPowerSaveWhitelistApp(String name); diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 9b8a40a6cab0..0cce19222d27 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -184,6 +184,7 @@ interface INetworkManagementService /** * Returns a list of currently tethered interfaces */ + @UnsupportedAppUsage String[] listTetheredInterfaces(); /** diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index e1d605e1c99d..185693e8e6e0 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -47,6 +47,7 @@ interface IPowerManager void wakeUp(long time, int reason, String details, String opPackageName); @UnsupportedAppUsage void goToSleep(long time, int reason, int flags); + @UnsupportedAppUsage(maxTargetSdk = 28) void nap(long time); @UnsupportedAppUsage boolean isInteractive(); diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index dbe3c93738b8..041f31d67a3e 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -364,6 +364,11 @@ public final class Parcel { * @hide */ public static class ReadWriteHelper { + + @UnsupportedAppUsage + public ReadWriteHelper() { + } + public static final ReadWriteHelper DEFAULT = new ReadWriteHelper(); /** @@ -3148,6 +3153,7 @@ public final class Parcel { // Cache of previously looked up CREATOR.createFromParcel() methods for // particular classes. Keys are the names of the classes, values are // Method objects. + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private static final HashMap<ClassLoader,HashMap<String,Parcelable.Creator<?>>> mCreators = new HashMap<>(); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 2fff595d7150..ab4d424ac053 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -824,6 +824,7 @@ public final class PowerManager { final Context mContext; @UnsupportedAppUsage final IPowerManager mService; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) final Handler mHandler; IThermalService mThermalService; diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index f85297627d76..8d74fc5d962c 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -1003,6 +1003,7 @@ public class Process { * your own log, or the Android Illuminati will find you some night and * beat you up. */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public static final native void sendSignalQuiet(int pid, int signal); /** @hide */ diff --git a/core/java/android/os/Registrant.java b/core/java/android/os/Registrant.java index 8fb123aa3da4..572b975fbafd 100644 --- a/core/java/android/os/Registrant.java +++ b/core/java/android/os/Registrant.java @@ -114,6 +114,7 @@ public class Registrant } } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public Handler getHandler() { diff --git a/core/java/android/os/RegistrantList.java b/core/java/android/os/RegistrantList.java index 6e562ffc88ea..9c017dfff967 100644 --- a/core/java/android/os/RegistrantList.java +++ b/core/java/android/os/RegistrantList.java @@ -17,7 +17,6 @@ package android.os; import android.annotation.UnsupportedAppUsage; -import android.os.Handler; import java.util.ArrayList; @@ -27,6 +26,10 @@ public class RegistrantList ArrayList registrants = new ArrayList(); // of Registrant @UnsupportedAppUsage + public RegistrantList() { + } + + @UnsupportedAppUsage public synchronized void add(Handler h, int what, Object obj) { @@ -70,6 +73,7 @@ public class RegistrantList return registrants.size(); } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public synchronized Object get(int index) { diff --git a/core/java/android/os/RemoteCallback.java b/core/java/android/os/RemoteCallback.java index 047ba1d20056..da58d0fac160 100644 --- a/core/java/android/os/RemoteCallback.java +++ b/core/java/android/os/RemoteCallback.java @@ -21,6 +21,8 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * @hide */ @@ -33,6 +35,7 @@ public final class RemoteCallback implements Parcelable { } private final OnResultListener mListener; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private final Handler mHandler; private final IRemoteCallback mCallback; diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index 9a9b0306063b..bf9225a2780a 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -102,6 +102,10 @@ public final class ServiceManager { }); @UnsupportedAppUsage + public ServiceManager() { + } + + @UnsupportedAppUsage private static IServiceManager getIServiceManager() { if (sServiceManager != null) { return sServiceManager; diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java index a6e5972faa55..8b0ffe155fc3 100644 --- a/core/java/android/os/SystemProperties.java +++ b/core/java/android/os/SystemProperties.java @@ -95,12 +95,17 @@ public class SystemProperties { @UnsupportedAppUsage private static native String native_get(String key); + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private static native String native_get(String key, String def); + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private static native int native_get_int(String key, int def); @UnsupportedAppUsage private static native long native_get_long(String key, long def); + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private static native boolean native_get_boolean(String key, boolean def); + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private static native void native_set(String key, String def); + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private static native void native_add_change_callback(); private static native void native_report_sysprop_change(); diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index d70ba9921bfd..4e17f7e92013 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -354,6 +354,7 @@ public final class UserHandle implements Parcelable { * components -- user, app, isolated, etc. * @hide */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public static void formatUid(PrintWriter pw, int uid) { if (uid < Process.FIRST_APPLICATION_UID) { pw.print(uid); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index af9e592f9036..e92e435fa733 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2370,6 +2370,8 @@ public class UserManager { /** * Return the number of users currently created on the device. + * <p>This API is not for use by third-party apps. It requires the {@code MANAGE_USERS} + * permission.</p> */ public int getUserCount() { List<UserInfo> users = getUsers(); diff --git a/core/java/android/os/WorkSource.java b/core/java/android/os/WorkSource.java index 634b2baf098a..9cc9aac490c7 100644 --- a/core/java/android/os/WorkSource.java +++ b/core/java/android/os/WorkSource.java @@ -40,14 +40,17 @@ public class WorkSource implements Parcelable { * The WorkSource object itself is not thread safe, but we need to * hold sTmpWorkSource lock while working with these statics. */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) static final WorkSource sTmpWorkSource = new WorkSource(0); /** * For returning newbie work from a modification operation. */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) static WorkSource sNewbWork; /** * For returning gone work form a modification operation. */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) static WorkSource sGoneWork; /** @@ -620,6 +623,7 @@ public class WorkSource implements Parcelable { return changed; } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private boolean updateLocked(WorkSource other, boolean set, boolean returnNewbs) { if (mNames == null && other.mNames == null) { return updateUidsLocked(other, set, returnNewbs); diff --git a/core/java/android/os/storage/StorageEventListener.java b/core/java/android/os/storage/StorageEventListener.java index 4aa0b08ae358..39d5b4529745 100644 --- a/core/java/android/os/storage/StorageEventListener.java +++ b/core/java/android/os/storage/StorageEventListener.java @@ -24,6 +24,11 @@ import android.annotation.UnsupportedAppUsage; * @hide */ public class StorageEventListener { + + @UnsupportedAppUsage + public StorageEventListener() { + } + /** * Called when the detection state of a USB Mass Storage host has changed. * @param connected true if the USB mass storage is connected. diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 0973a6412384..3d54ba10ef0c 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -35,6 +35,7 @@ import android.provider.ContactsContract.CommonDataKinds.Callable; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.DataUsageFeedback; +import android.telecom.CallerInfo; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; @@ -42,7 +43,6 @@ import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.util.Log; -import android.telephony.CallerInfo; import com.android.internal.telephony.PhoneConstants; import java.util.List; diff --git a/core/java/android/service/carrier/ICarrierMessagingService.aidl b/core/java/android/service/carrier/ICarrierMessagingService.aidl index 2d96c3da6487..c4dfb57bb6a0 100644 --- a/core/java/android/service/carrier/ICarrierMessagingService.aidl +++ b/core/java/android/service/carrier/ICarrierMessagingService.aidl @@ -36,6 +36,7 @@ oneway interface ICarrierMessagingService { * @param subId SMS subscription ID of the SIM * @param callback the callback to notify upon completion */ + @UnsupportedAppUsage(maxTargetSdk = 28) void filterSms( in MessagePdu pdu, String format, int destPort, int subId, in ICarrierMessagingCallback callback); diff --git a/core/java/android/service/dreams/IDreamManager.aidl b/core/java/android/service/dreams/IDreamManager.aidl index d3f2a70029f7..d254ffdb6986 100644 --- a/core/java/android/service/dreams/IDreamManager.aidl +++ b/core/java/android/service/dreams/IDreamManager.aidl @@ -29,6 +29,7 @@ interface IDreamManager { void awaken(); @UnsupportedAppUsage void setDreamComponents(in ComponentName[] componentNames); + @UnsupportedAppUsage ComponentName[] getDreamComponents(); ComponentName getDefaultDreamComponent(); void testDream(in ComponentName componentName); diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index b44c9d59ebe5..93e3ea44f7c7 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -1514,6 +1514,7 @@ public abstract class NotificationListenerService extends Service { private ArrayList<Notification.Action> mSmartActions; private ArrayList<CharSequence> mSmartReplies; private boolean mCanBubble; + private boolean mVisuallyInterruptive; private static final int PARCEL_VERSION = 2; @@ -1545,6 +1546,7 @@ public abstract class NotificationListenerService extends Service { out.writeTypedList(mSmartActions, flags); out.writeCharSequenceList(mSmartReplies); out.writeBoolean(mCanBubble); + out.writeBoolean(mVisuallyInterruptive); } /** @hide */ @@ -1577,6 +1579,7 @@ public abstract class NotificationListenerService extends Service { mSmartActions = in.createTypedArrayList(Notification.Action.CREATOR); mSmartReplies = in.readCharSequenceList(); mCanBubble = in.readBoolean(); + mVisuallyInterruptive = in.readBoolean(); } @@ -1764,6 +1767,11 @@ public abstract class NotificationListenerService extends Service { } /** @hide */ + public boolean visuallyInterruptive() { + return mVisuallyInterruptive; + } + + /** @hide */ public boolean isNoisy() { return mNoisy; } @@ -1779,7 +1787,8 @@ public abstract class NotificationListenerService extends Service { ArrayList<SnoozeCriterion> snoozeCriteria, boolean showBadge, int userSentiment, boolean hidden, long lastAudiblyAlertedMs, boolean noisy, ArrayList<Notification.Action> smartActions, - ArrayList<CharSequence> smartReplies, boolean canBubble) { + ArrayList<CharSequence> smartReplies, boolean canBubble, + boolean visuallyInterruptive) { mKey = key; mRank = rank; mIsAmbient = importance < NotificationManager.IMPORTANCE_LOW; @@ -1800,6 +1809,7 @@ public abstract class NotificationListenerService extends Service { mSmartActions = smartActions; mSmartReplies = smartReplies; mCanBubble = canBubble; + mVisuallyInterruptive = visuallyInterruptive; } /** @@ -1824,7 +1834,8 @@ public abstract class NotificationListenerService extends Service { other.mNoisy, other.mSmartActions, other.mSmartReplies, - other.mCanBubble); + other.mCanBubble, + other.mVisuallyInterruptive); } /** diff --git a/core/java/android/util/Singleton.java b/core/java/android/util/Singleton.java index 33135e6fd62c..15c6b5b5d7f8 100644 --- a/core/java/android/util/Singleton.java +++ b/core/java/android/util/Singleton.java @@ -26,6 +26,11 @@ import android.annotation.UnsupportedAppUsage; * @hide */ public abstract class Singleton<T> { + + @UnsupportedAppUsage + public Singleton() { + } + @UnsupportedAppUsage private T mInstance; diff --git a/core/java/android/view/AccessibilityIterators.java b/core/java/android/view/AccessibilityIterators.java index 54cfc00cb5b3..5f9bf39fb3dd 100644 --- a/core/java/android/view/AccessibilityIterators.java +++ b/core/java/android/view/AccessibilityIterators.java @@ -47,6 +47,10 @@ public final class AccessibilityIterators { public static abstract class AbstractTextSegmentIterator implements TextSegmentIterator { @UnsupportedAppUsage + public AbstractTextSegmentIterator() { + } + + @UnsupportedAppUsage protected String mText; private final int[] mSegment = new int[2]; diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 39792ce58367..1c3294858db8 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -151,6 +151,7 @@ interface IWindowManager float getCurrentAnimatorScale(); // For testing + @UnsupportedAppUsage(maxTargetSdk = 28) void setInTouchMode(boolean showFocus); // For StrictMode flashing a red border on violations from the UI @@ -158,6 +159,7 @@ interface IWindowManager // Manager uses that to determine whether or not the red border should // actually be shown. (it will be ignored that pid doesn't have windows // on screen) + @UnsupportedAppUsage(maxTargetSdk = 28) void showStrictModeViolation(boolean on); // Proxy to set the system property for whether the flashing diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index c6536bb71cba..8bbfd7441d0a 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -492,7 +492,7 @@ import java.util.function.Predicate; * * <p> * To initiate a layout, call {@link #requestLayout}. This method is typically - * called by a view on itself when it believes that is can no longer fit within + * called by a view on itself when it believes that it can no longer fit within * its current bounds. * </p> * @@ -2850,7 +2850,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Default for the root view. The gravity determines the text alignment, ALIGN_NORMAL, - * ALIGN_CENTER, or ALIGN_OPPOSITE, which are relative to each paragraph’s text direction. + * ALIGN_CENTER, or ALIGN_OPPOSITE, which are relative to each paragraph's text direction. * * Use with {@link #setTextAlignment(int)} */ @@ -2878,7 +2878,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int TEXT_ALIGNMENT_CENTER = 4; /** - * Align to the start of the view, which is ALIGN_LEFT if the view’s resolved + * Align to the start of the view, which is ALIGN_LEFT if the view's resolved * layoutDirection is LTR, and ALIGN_RIGHT otherwise. * * Use with {@link #setTextAlignment(int)} @@ -2886,7 +2886,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int TEXT_ALIGNMENT_VIEW_START = 5; /** - * Align to the end of the view, which is ALIGN_RIGHT if the view’s resolved + * Align to the end of the view, which is ALIGN_RIGHT if the view's resolved * layoutDirection is LTR, and ALIGN_LEFT otherwise. * * Use with {@link #setTextAlignment(int)} @@ -3689,7 +3689,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * if the user swipes from the top of the screen. * <p>When system bars are hidden in immersive mode, they can be revealed temporarily with * system gestures, such as swiping from the top of the screen. These transient system bars - * will overlay app’s content, may have some degree of transparency, and will automatically + * will overlay app's content, may have some degree of transparency, and will automatically * hide after a short timeout. * </p><p>Since this flag is a modifier for {@link #SYSTEM_UI_FLAG_FULLSCREEN} and * {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, it only has an effect when used in combination @@ -4555,6 +4555,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } static class ListenerInfo { + + @UnsupportedAppUsage + ListenerInfo() { + } + /** * Listener used to dispatch focus change events. * This field should be made private, so it is hidden from the SDK. @@ -10293,7 +10298,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** - * Gets the unique identifier of the window in which this View reseides. + * Gets the unique identifier of the window in which this View resides. * * @return The window accessibility id. * @@ -26391,7 +26396,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Returns the over-scroll mode for this view. The result will be - * one of {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} + * one of {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} * (allow over-scrolling only if the view content is larger than the container), * or {@link #OVER_SCROLL_NEVER}. * @@ -26408,7 +26413,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Set the over-scroll mode for this view. Valid over-scroll modes are - * {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} + * {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} * (allow over-scrolling only if the view content is larger than the container), * or {@link #OVER_SCROLL_NEVER}. * @@ -27842,6 +27847,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ private int mClassification; + @UnsupportedAppUsage + private CheckForLongPress() { + } + @Override public void run() { if ((mOriginalPressedState == isPressed()) && (mParent != null) @@ -28327,6 +28336,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * whenever possible. */ static class InvalidateInfo { + + @UnsupportedAppUsage + InvalidateInfo() { + } + private static final int POOL_LIMIT = 10; private static final SynchronizedPool<InvalidateInfo> sPool = diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java index 9a5f4c9cc8b9..c72baca0b93b 100644 --- a/core/java/android/view/ViewTreeObserver.java +++ b/core/java/android/view/ViewTreeObserver.java @@ -218,6 +218,11 @@ public final class ViewTreeObserver { * @hide */ public final static class InternalInsetsInfo { + + @UnsupportedAppUsage + public InternalInsetsInfo() { + } + /** * Offsets from the frame of the window at which the content of * windows behind it should be placed. diff --git a/core/java/android/view/animation/AnimationUtils.java b/core/java/android/view/animation/AnimationUtils.java index c877b9cec812..f5b074674454 100644 --- a/core/java/android/view/animation/AnimationUtils.java +++ b/core/java/android/view/animation/AnimationUtils.java @@ -127,7 +127,7 @@ public class AnimationUtils { * * @param context Application context used to access resources * @param id The resource id of the animation to load - * @return The animation object reference by the specified id + * @return The animation object referenced by the specified id * @throws NotFoundException when the animation cannot be loaded */ public static Animation loadAnimation(Context context, @AnimRes int id) @@ -208,7 +208,7 @@ public class AnimationUtils { * * @param context Application context used to access resources * @param id The resource id of the animation to load - * @return The animation object reference by the specified id + * @return The animation controller object referenced by the specified id * @throws NotFoundException when the layout animation controller cannot be loaded */ public static LayoutAnimationController loadLayoutAnimation(Context context, @AnimRes int id) @@ -331,7 +331,7 @@ public class AnimationUtils { * * @param context Application context used to access resources * @param id The resource id of the animation to load - * @return The animation object reference by the specified id + * @return The interpolator object referenced by the specified id * @throws NotFoundException */ public static Interpolator loadInterpolator(Context context, @AnimRes @InterpolatorRes int id) @@ -361,7 +361,7 @@ public class AnimationUtils { * * @param res The resources * @param id The resource id of the animation to load - * @return The interpolator object reference by the specified id + * @return The interpolator object referenced by the specified id * @throws NotFoundException * @hide */ diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index 563e00e3ca6a..7e067197ced8 100644 --- a/core/java/android/webkit/CacheManager.java +++ b/core/java/android/webkit/CacheManager.java @@ -50,6 +50,11 @@ public final class CacheManager { */ @Deprecated public static class CacheResult { + + @UnsupportedAppUsage + public CacheResult() { + } + // these fields are saved to the database @UnsupportedAppUsage int httpStatusCode; diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 7282008f7e3a..2895621f962a 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -328,6 +328,9 @@ public abstract class WebSettings { * <p> * The built-in mechanisms are the only currently supported zoom * mechanisms, so it is recommended that this setting is always enabled. + * However, on-screen zoom controls are deprecated in Android (see + * {@link android.widget.ZoomButtonsController}) so it's recommended to + * disable {@link #setDisplayZoomControls}. * * @param enabled whether the WebView should use its built-in zoom mechanisms */ @@ -347,7 +350,9 @@ public abstract class WebSettings { /** * Sets whether the WebView should display on-screen zoom controls when * using the built-in zoom mechanisms. See {@link #setBuiltInZoomControls}. - * The default is {@code true}. + * The default is {@code true}. However, on-screen zoom controls are deprecated + * in Android (see {@link android.widget.ZoomButtonsController}) so it's + * recommended to set this to {@code false}. * * @param enabled whether the WebView should display on-screen zoom controls */ diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 2f44d6ee88b1..b732b7eeaa01 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -120,10 +120,6 @@ import java.util.function.Predicate; * <a href="{@docRoot}training/improving-layouts/smooth-scrolling.html"> * Making ListView Scrolling Smooth</a> for more ways to ensure a smooth user experience.</p> * - * <p>For a more complete example of creating a custom adapter, see the - * <a href="{@docRoot}samples/CustomChoiceList/index.html"> - * Custom Choice List</a> sample app.</p> - * * <p>To specify an action when a user clicks or taps on a single list item, see * <a href="{@docRoot}guide/topics/ui/declaring-layout.html#HandlingUserSelections"> * Handling click events</a>.</p> diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 6b324a541c42..facb7d09f250 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -36,7 +36,6 @@ import android.view.ViewGroup; import android.view.ViewHierarchyEncoder; import android.view.accessibility.AccessibilityEvent; import android.view.inspector.InspectableProperty; -import android.view.inspector.InspectionCompanion; import android.view.inspector.PropertyMapper; import android.view.inspector.PropertyReader; import android.widget.RemoteViews.RemoteView; @@ -73,7 +72,7 @@ import java.util.TreeSet; * * <p>This behavior has been preserved for apps that set <code>android:targetSdkVersion="17"</code> * or older in their manifest's <code>uses-sdk</code> tag for compatibility. Apps targeting SDK - * version 18 or newer will receive the correct behavior</p> + * version 18 or newer will receive the correct behavior.</p> * * <p>See the <a href="{@docRoot}guide/topics/ui/layout/relative.html">Relative * Layout</a> guide.</p> @@ -2026,6 +2025,11 @@ public class RelativeLayout extends ViewGroup { * A node with no dependent is considered a root of the graph. */ static class Node { + + @UnsupportedAppUsage + Node() { + } + /** * The view representing this node in the layout. */ diff --git a/core/java/android/widget/ScrollBarDrawable.java b/core/java/android/widget/ScrollBarDrawable.java index 1bed32ecf347..a5d3e45323a4 100644 --- a/core/java/android/widget/ScrollBarDrawable.java +++ b/core/java/android/widget/ScrollBarDrawable.java @@ -60,6 +60,10 @@ public class ScrollBarDrawable extends Drawable implements Drawable.Callback { private ColorFilter mColorFilter; private boolean mHasSetColorFilter; + @UnsupportedAppUsage + public ScrollBarDrawable() { + } + /** * Indicate whether the horizontal scrollbar track should always be drawn * regardless of the extent. Defaults to false. diff --git a/core/java/com/android/internal/app/AlertActivity.java b/core/java/com/android/internal/app/AlertActivity.java index 0b08099b51ed..7307de5146f8 100644 --- a/core/java/com/android/internal/app/AlertActivity.java +++ b/core/java/com/android/internal/app/AlertActivity.java @@ -34,6 +34,10 @@ import android.view.accessibility.AccessibilityEvent; */ public abstract class AlertActivity extends Activity implements DialogInterface { + @UnsupportedAppUsage + public AlertActivity() { + } + /** * The model for the alert. * diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index cae1f3831b4a..102ba5c2ec5e 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -26,6 +26,7 @@ import android.animation.ValueAnimator; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.app.Activity; import android.app.ActivityManager; import android.app.prediction.AppPredictionContext; @@ -141,6 +142,9 @@ import java.util.Set; public class ChooserActivity extends ResolverActivity { private static final String TAG = "ChooserActivity"; + @UnsupportedAppUsage + public ChooserActivity() { + } /** * Boolean extra to change the following behavior: Normally, ChooserActivity finishes itself diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 068056f091d7..c7d2547a24f4 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -101,6 +101,10 @@ import java.util.Set; @UiThread public class ResolverActivity extends Activity { + @UnsupportedAppUsage + public ResolverActivity() { + } + // Temporary flag for new chooser delegate behavior. boolean mEnableChooserDelegate = true; diff --git a/core/java/com/android/internal/content/PackageMonitor.java b/core/java/com/android/internal/content/PackageMonitor.java index c928f3f39f03..5d7d3af8750a 100644 --- a/core/java/com/android/internal/content/PackageMonitor.java +++ b/core/java/com/android/internal/content/PackageMonitor.java @@ -27,6 +27,7 @@ import android.os.Handler; import android.os.Looper; import android.os.UserHandle; import android.util.Slog; + import com.android.internal.os.BackgroundThread; import com.android.internal.util.Preconditions; @@ -72,6 +73,10 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver { String[] mTempArray = new String[1]; @UnsupportedAppUsage + public PackageMonitor() { + } + + @UnsupportedAppUsage public void register(Context context, Looper thread, boolean externalStorage) { register(context, thread, null, externalStorage); } diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index a691a2403f37..f916cf64564d 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -41,6 +41,10 @@ public class MetricsLogger { private static MetricsLogger sMetricsLogger; + @UnsupportedAppUsage + public MetricsLogger() { + } + private static MetricsLogger getLogger() { if (sMetricsLogger == null) { sMetricsLogger = new MetricsLogger(); diff --git a/core/java/com/android/internal/net/LegacyVpnInfo.java b/core/java/com/android/internal/net/LegacyVpnInfo.java index 9ee97108ce49..2ad9759b1f68 100644 --- a/core/java/com/android/internal/net/LegacyVpnInfo.java +++ b/core/java/com/android/internal/net/LegacyVpnInfo.java @@ -45,6 +45,10 @@ public class LegacyVpnInfo implements Parcelable { public int state = -1; public PendingIntent intent; + @UnsupportedAppUsage + public LegacyVpnInfo() { + } + @Override public int describeContents() { return 0; diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index 65b974ba8b42..e6be54964705 100644 --- a/core/java/com/android/internal/net/VpnConfig.java +++ b/core/java/com/android/internal/net/VpnConfig.java @@ -108,6 +108,10 @@ public class VpnConfig implements Parcelable { public Network[] underlyingNetworks; public ProxyInfo proxyInfo; + @UnsupportedAppUsage + public VpnConfig() { + } + public void updateAllowedFamilies(InetAddress address) { if (address instanceof Inet4Address) { allowIPv4 = true; diff --git a/core/java/com/android/internal/os/BaseCommand.java b/core/java/com/android/internal/os/BaseCommand.java index 278f40660ee9..5ba662913529 100644 --- a/core/java/com/android/internal/os/BaseCommand.java +++ b/core/java/com/android/internal/os/BaseCommand.java @@ -40,6 +40,10 @@ public abstract class BaseCommand { private String[] mRawArgs; + @UnsupportedAppUsage + public BaseCommand() { + } + /** * Call to run the command. */ diff --git a/core/java/com/android/internal/os/BatterySipper.java b/core/java/com/android/internal/os/BatterySipper.java index 02c9542fa40d..b1fc369835c6 100644 --- a/core/java/com/android/internal/os/BatterySipper.java +++ b/core/java/com/android/internal/os/BatterySipper.java @@ -134,6 +134,8 @@ public class BatterySipper implements Comparable<BatterySipper> { // This list must be kept current with atoms.proto (frameworks/base/cmds/statsd/src/atoms.proto) // so the ordinal values (and therefore the order) must never change. // **************** + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/android/internal/os/BatterySipper$DrainType;") public enum DrainType { AMBIENT_DISPLAY, @UnsupportedAppUsage diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 46e041b3f33e..3d91c37272ad 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -114,6 +114,13 @@ public final class Zygote { */ public static final int DEBUG_IGNORE_APP_SIGNAL_HANDLER = 1 << 17; + /** + * Disable runtime access to {@link android.annotation.TestApi} annotated members. + * + * <p>This only takes effect if Hidden API access restrictions are enabled as well. + */ + public static final int DISABLE_TEST_API_ENFORCEMENT_POLICY = 1 << 18; + /** No external storage should be mounted. */ public static final int MOUNT_EXTERNAL_NONE = IVold.REMOUNT_MODE_NONE; /** Default external storage should be mounted. */ diff --git a/core/java/com/android/internal/preference/YesNoPreference.java b/core/java/com/android/internal/preference/YesNoPreference.java index 7abf416bf0af..94ef619f286a 100644 --- a/core/java/com/android/internal/preference/YesNoPreference.java +++ b/core/java/com/android/internal/preference/YesNoPreference.java @@ -23,6 +23,8 @@ import android.os.Parcelable; import android.preference.DialogPreference; import android.util.AttributeSet; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * The {@link YesNoPreference} is a preference to show a dialog with Yes and No * buttons. @@ -40,6 +42,7 @@ public class YesNoPreference extends DialogPreference { this(context, attrs, defStyleAttr, 0); } + @UnsupportedAppUsage public YesNoPreference(Context context, AttributeSet attrs) { this(context, attrs, com.android.internal.R.attr.yesNoPreferenceStyle); } diff --git a/core/java/com/android/internal/util/MemInfoReader.java b/core/java/com/android/internal/util/MemInfoReader.java index 630916ebeecb..c1d129b66e7a 100644 --- a/core/java/com/android/internal/util/MemInfoReader.java +++ b/core/java/com/android/internal/util/MemInfoReader.java @@ -24,6 +24,10 @@ public final class MemInfoReader { final long[] mInfos = new long[Debug.MEMINFO_COUNT]; @UnsupportedAppUsage + public MemInfoReader() { + } + + @UnsupportedAppUsage public void readMemInfo() { // Permit disk reads here, as /proc/meminfo isn't really "on // disk" and should be fast. TODO: make BlockGuard ignore diff --git a/core/java/com/android/internal/view/BaseIWindow.java b/core/java/com/android/internal/view/BaseIWindow.java index f9cdf3d0be61..f5a9fde97159 100644 --- a/core/java/com/android/internal/view/BaseIWindow.java +++ b/core/java/com/android/internal/view/BaseIWindow.java @@ -16,9 +16,11 @@ package com.android.internal.view; +import android.annotation.UnsupportedAppUsage; import android.graphics.Point; import android.graphics.Rect; import android.hardware.input.InputManager; +import android.os.Build; import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.os.RemoteException; @@ -37,6 +39,10 @@ public class BaseIWindow extends IWindow.Stub { private IWindowSession mSession; public int mSeq; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public BaseIWindow() { + } + public void setSession(IWindowSession session) { mSession = session; } diff --git a/core/java/com/android/internal/widget/PointerLocationView.java b/core/java/com/android/internal/widget/PointerLocationView.java index d48034b66266..1f5b0701d2a7 100644 --- a/core/java/com/android/internal/widget/PointerLocationView.java +++ b/core/java/com/android/internal/widget/PointerLocationView.java @@ -91,6 +91,10 @@ public class PointerLocationView extends View implements InputDeviceListener, private VelocityTracker.Estimator mEstimator = new VelocityTracker.Estimator(); private VelocityTracker.Estimator mAltEstimator = new VelocityTracker.Estimator(); + @UnsupportedAppUsage + public PointerState() { + } + public void clearTrace() { mTraceCount = 0; } diff --git a/core/java/com/android/server/net/BaseNetworkObserver.java b/core/java/com/android/server/net/BaseNetworkObserver.java index a0740eee5df6..e1a10a5805f5 100644 --- a/core/java/com/android/server/net/BaseNetworkObserver.java +++ b/core/java/com/android/server/net/BaseNetworkObserver.java @@ -28,6 +28,11 @@ import android.net.RouteInfo; * @hide */ public class BaseNetworkObserver extends INetworkManagementEventObserver.Stub { + + @UnsupportedAppUsage + public BaseNetworkObserver() { + } + @Override public void interfaceStatusChanged(String iface, boolean up) { // default no-op diff --git a/core/java/com/google/android/util/AbstractMessageParser.java b/core/java/com/google/android/util/AbstractMessageParser.java index 9d12f82aeb75..00fcb16f6d3a 100644 --- a/core/java/com/google/android/util/AbstractMessageParser.java +++ b/core/java/com/google/android/util/AbstractMessageParser.java @@ -17,13 +17,14 @@ package com.google.android.util; import android.annotation.UnsupportedAppUsage; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.List; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.Set; -import java.util.List; /** * @@ -653,8 +654,9 @@ public abstract class AbstractMessageParser { /** Represents a unit of parsed output. */ public static abstract class Token { + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/google/android/util/AbstractMessageParser$Token$Type;") public enum Type { - @UnsupportedAppUsage HTML ("html"), @UnsupportedAppUsage diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ea62c980ca17..7dc0788d0f3e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -448,7 +448,7 @@ </string-array> <!-- Package name for the default CellBroadcastService module [DO NOT TRANSLATE] --> - <string name="cellbroadcast_default_package" translatable="false">com.android.cellbroadcastreceiver + <string name="cellbroadcast_default_package" translatable="false">com.android.cellbroadcastservice </string> <!-- If the mobile hotspot feature requires provisioning, a package name and class name diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 55271258c882..cbeca16758f6 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4858,10 +4858,10 @@ <string name="confirm_battery_saver">OK</string> <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description, with a "learn more" link. --> - <string name="battery_saver_description_with_learn_more">Battery Saver turns off or restricts background activity, some visual effects \u0026 other high-power features to extend battery life. <annotation id="url">Learn More</annotation></string> + <string name="battery_saver_description_with_learn_more">To extend battery life, Battery Saver:\n·Turns on Dark theme\n·Turns off or restricts background activity, some visual effects, and other features like \u201cHey Google\u201d\n\n<annotation id="url">Learn more</annotation></string> <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description, without a "learn more" link. --> - <string name="battery_saver_description">Battery Saver turns off or restricts background activity, some visual effects \u0026 other high-power features to extend battery life.</string> + <string name="battery_saver_description">To extend battery life, Battery Saver:\n·Turns on Dark theme\n·Turns off or restricts background activity, some visual effects, and other features like \u201cHey Google\u201d</string> <!-- [CHAR_LIMIT=NONE] Data saver: Feature description --> <string name="data_saver_description">To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them.</string> diff --git a/core/tests/coretests/src/android/content/pm/PackageParserTest.java b/core/tests/coretests/src/android/content/pm/PackageParserTest.java index 58c43ac2cf91..5e41355601e4 100644 --- a/core/tests/coretests/src/android/content/pm/PackageParserTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageParserTest.java @@ -508,7 +508,12 @@ public class PackageParserTest { apexInfo.modulePath = apexFile.getPath(); apexInfo.versionCode = 191000070; int flags = PackageManager.GET_META_DATA | PackageManager.GET_SIGNING_CERTIFICATES; - PackageInfo pi = PackageParser.generatePackageInfoFromApex(apexInfo, flags); + + PackageParser pp = new PackageParser(); + Package p = pp.parsePackage(apexFile, flags, false); + PackageParser.collectCertificates(p, false); + PackageInfo pi = PackageParser.generatePackageInfo(p, apexInfo, flags); + assertEquals("com.google.android.tzdata", pi.applicationInfo.packageName); assertTrue(pi.applicationInfo.enabled); assertEquals(28, pi.applicationInfo.targetSdkVersion); diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 14011373d2ed..80f3cc68221f 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -49,6 +49,12 @@ applications that come with the platform <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/> </privapp-permissions> + <privapp-permissions package="com.android.cellbroadcastservice"> + <permission name="android.permission.MODIFY_PHONE_STATE"/> + <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> + <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/> + </privapp-permissions> + <privapp-permissions package="com.android.externalstorage"> <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> <permission name="android.permission.WRITE_MEDIA_STORAGE"/> diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index b7316ab03618..109d8631284d 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -1114,7 +1114,7 @@ public class Paint { * Return the width for stroking. * <p /> * A value of 0 strokes in hairline mode. - * Hairlines always draws a single pixel independent of the canva's matrix. + * Hairlines always draws a single pixel independent of the canvas's matrix. * * @return the paint's stroke width, used whenever the paint's style is * Stroke or StrokeAndFill. @@ -1126,7 +1126,7 @@ public class Paint { /** * Set the width for stroking. * Pass 0 to stroke in hairline mode. - * Hairlines always draws a single pixel independent of the canva's matrix. + * Hairlines always draws a single pixel independent of the canvas's matrix. * * @param width set the paint's stroke width, used whenever the paint's * style is Stroke or StrokeAndFill. @@ -1958,8 +1958,8 @@ public class Paint { * <code> * Paint paint = new Paint(); * paint.setStartHyphenEdit(Paint.START_HYPHEN_EDIT_INSERT_HYPHEN); - * paint.measureText("abc", 0, 3); // Returns the width of "‐abc" - * Canvas.drawText("abc", 0, 3, 0f, 0f, paint); // Draws "‐abc" + * paint.measureText("abc", 0, 3); // Returns the width of "-abc" + * Canvas.drawText("abc", 0, 3, 0f, 0f, paint); // Draws "-abc" * </code> * </pre> * @@ -1985,8 +1985,8 @@ public class Paint { * <code> * Paint paint = new Paint(); * paint.setEndHyphenEdit(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN); - * paint.measureText("abc", 0, 3); // Returns the width of "abc‐" - * Canvas.drawText("abc", 0, 3, 0f, 0f, paint); // Draws "abc‐" + * paint.measureText("abc", 0, 3); // Returns the width of "abc-" + * Canvas.drawText("abc", 0, 3, 0f, 0f, paint); // Draws "abc-" * </code> * </pre> * diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java index e8905143eb37..f9b2fe057995 100644 --- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java +++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java @@ -37,6 +37,8 @@ import com.android.internal.R; import com.android.internal.notification.SystemNotificationChannels; import com.android.internal.telephony.GsmAlphabet; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.io.UnsupportedEncodingException; import java.util.concurrent.TimeUnit; @@ -115,6 +117,7 @@ public class GpsNetInitiatedHandler { private final INetInitiatedListener mNetInitiatedListener; // Set to true if string from HAL is encoded as Hex, e.g., "3F0039" + @UnsupportedAppUsage static private boolean mIsHexInput = true; // End time of emergency call, and extension, if set @@ -123,6 +126,9 @@ public class GpsNetInitiatedHandler { public static class GpsNiNotification { + @android.annotation.UnsupportedAppUsage + public GpsNiNotification() { + } public int notificationId; public int niType; public boolean needNotify; @@ -130,9 +136,13 @@ public class GpsNetInitiatedHandler { public boolean privacyOverride; public int timeout; public int defaultResponse; + @UnsupportedAppUsage public String requestorId; + @UnsupportedAppUsage public String text; + @UnsupportedAppUsage public int requestorIdEncoding; + @UnsupportedAppUsage public int textEncoding; }; @@ -258,6 +268,7 @@ public class GpsNetInitiatedHandler { } // Handles NI events from HAL + @UnsupportedAppUsage public void handleNiNotification(GpsNiNotification notif) { if (DEBUG) Log.d(TAG, "in handleNiNotification () :" + " notificationId: " + notif.notificationId @@ -539,6 +550,7 @@ public class GpsNetInitiatedHandler { * set to -1, and <code> isHex </code> can be false. * @return the decoded string */ + @UnsupportedAppUsage static private String decodeString(String original, boolean isHex, int coding) { if (coding == GPS_ENC_NONE || coding == GPS_ENC_UNKNOWN) { diff --git a/location/java/com/android/internal/location/ILocationProvider.aidl b/location/java/com/android/internal/location/ILocationProvider.aidl index a5716304f0d8..8ae972bde4f9 100644 --- a/location/java/com/android/internal/location/ILocationProvider.aidl +++ b/location/java/com/android/internal/location/ILocationProvider.aidl @@ -29,10 +29,13 @@ import com.android.internal.location.ProviderRequest; */ interface ILocationProvider { + @UnsupportedAppUsage oneway void setLocationProviderManager(in ILocationProviderManager manager); + @UnsupportedAppUsage oneway void setRequest(in ProviderRequest request, in WorkSource ws); + @UnsupportedAppUsage oneway void sendExtraCommand(String command, in Bundle extras); // --- deprecated and will be removed the future --- diff --git a/media/java/android/media/IRingtonePlayer.aidl b/media/java/android/media/IRingtonePlayer.aidl index c038f36206f6..02fa94c845a6 100644 --- a/media/java/android/media/IRingtonePlayer.aidl +++ b/media/java/android/media/IRingtonePlayer.aidl @@ -27,6 +27,7 @@ import android.os.UserHandle; */ interface IRingtonePlayer { /** Used for Ringtone.java playback */ + @UnsupportedAppUsage oneway void play(IBinder token, in Uri uri, in AudioAttributes aa, float volume, boolean looping); oneway void playWithVolumeShaping(IBinder token, in Uri uri, in AudioAttributes aa, float volume, boolean looping, in @nullable VolumeShaper.Configuration volumeShaperConfig); diff --git a/media/java/android/media/Image.java b/media/java/android/media/Image.java index 70a343f4de01..7ba122baeca1 100644 --- a/media/java/android/media/Image.java +++ b/media/java/android/media/Image.java @@ -395,7 +395,7 @@ public abstract class Image implements AutoCloseable { * <p>The row stride for this color plane, in bytes.</p> * * <p>This is the distance between the start of two consecutive rows of - * pixels in the image. Note that row stried is undefined for some formats + * pixels in the image. Note that row stride is undefined for some formats * such as * {@link android.graphics.ImageFormat#RAW_PRIVATE RAW_PRIVATE}, * and calling getRowStride on images of these formats will diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 510ee442f852..c9d79784004c 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -1702,20 +1702,22 @@ final public class MediaCodec { break; } case EVENT_FRAME_RENDERED: - synchronized (mListenerLock) { - Map<String, Object> map = (Map<String, Object>)msg.obj; - for (int i = 0; ; ++i) { - Object mediaTimeUs = map.get(i + "-media-time-us"); - Object systemNano = map.get(i + "-system-nano"); - if (mediaTimeUs == null || systemNano == null - || mOnFrameRenderedListener == null) { - break; - } - mOnFrameRenderedListener.onFrameRendered( - mCodec, (long)mediaTimeUs, (long)systemNano); + Map<String, Object> map = (Map<String, Object>)msg.obj; + for (int i = 0; ; ++i) { + Object mediaTimeUs = map.get(i + "-media-time-us"); + Object systemNano = map.get(i + "-system-nano"); + OnFrameRenderedListener onFrameRenderedListener; + synchronized (mListenerLock) { + onFrameRenderedListener = mOnFrameRenderedListener; } - break; + if (mediaTimeUs == null || systemNano == null + || onFrameRenderedListener == null) { + break; + } + onFrameRenderedListener.onFrameRendered( + mCodec, (long)mediaTimeUs, (long)systemNano); } + break; default: { break; diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 09221a37cb13..c4eb0310f292 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -79,6 +79,10 @@ public class MediaFile { @UnsupportedAppUsage private static final HashMap<Integer, String> sFormatToMimeTypeMap = new HashMap<>(); + @UnsupportedAppUsage + public MediaFile() { + } + /** @deprecated file types no longer exist */ @Deprecated @UnsupportedAppUsage diff --git a/opengl/java/com/google/android/gles_jni/EGLImpl.java b/opengl/java/com/google/android/gles_jni/EGLImpl.java index 41fb07228791..f94f69f0fd3f 100644 --- a/opengl/java/com/google/android/gles_jni/EGLImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLImpl.java @@ -16,12 +16,18 @@ package com.google.android.gles_jni; -import javax.microedition.khronos.egl.*; - import android.graphics.SurfaceTexture; import android.view.Surface; -import android.view.SurfaceView; import android.view.SurfaceHolder; +import android.view.SurfaceView; + +import dalvik.annotation.compat.UnsupportedAppUsage; + +import javax.microedition.khronos.egl.EGL10; +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.egl.EGLContext; +import javax.microedition.khronos.egl.EGLDisplay; +import javax.microedition.khronos.egl.EGLSurface; public class EGLImpl implements EGL10 { private EGLContextImpl mContext = new EGLContextImpl(-1); @@ -50,6 +56,10 @@ public class EGLImpl implements EGL10 { /** @hide **/ public static native int getInitCount(EGLDisplay display); + @UnsupportedAppUsage + public EGLImpl() { + } + public EGLContext eglCreateContext(EGLDisplay display, EGLConfig config, EGLContext share_context, int[] attrib_list) { long eglContextId = _eglCreateContext(display, config, share_context, attrib_list); if (eglContextId == 0) { diff --git a/opengl/java/com/google/android/gles_jni/GLImpl.java b/opengl/java/com/google/android/gles_jni/GLImpl.java index d4c0c8049dad..2a8d07f03148 100644 --- a/opengl/java/com/google/android/gles_jni/GLImpl.java +++ b/opengl/java/com/google/android/gles_jni/GLImpl.java @@ -26,7 +26,10 @@ import android.os.Build; import android.os.UserHandle; import android.util.Log; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.nio.Buffer; + import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.opengles.GL10Ext; import javax.microedition.khronos.opengles.GL11; @@ -56,6 +59,7 @@ public class GLImpl implements GL10, GL10Ext, GL11, GL11Ext, GL11ExtensionPack { private boolean have_OES_framebuffer_object; private boolean have_OES_texture_cube_map; + @UnsupportedAppUsage public GLImpl() { } diff --git a/packages/CarSystemUI/res/layout/super_status_bar.xml b/packages/CarSystemUI/res/layout/super_status_bar.xml index 0b346260896a..7fee8051c472 100644 --- a/packages/CarSystemUI/res/layout/super_status_bar.xml +++ b/packages/CarSystemUI/res/layout/super_status_bar.xml @@ -42,14 +42,6 @@ </com.android.systemui.statusbar.BackDropView> <com.android.systemui.statusbar.ScrimView - android:id="@+id/scrim_for_bubble" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:importantForAccessibility="no" - sysui:ignoreRightInset="true" - /> - - <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_behind" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java index eb826e54d340..d43e030ed9eb 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java @@ -184,6 +184,8 @@ public class BubbleData { Log.d(TAG, "notificationEntryUpdated: " + entry); } Bubble bubble = getBubbleWithKey(entry.key); + suppressFlyout = !entry.isVisuallyInterruptive || suppressFlyout; + if (bubble == null) { // Create a new bubble bubble = new Bubble(mContext, entry); @@ -193,8 +195,10 @@ public class BubbleData { } else { // Updates an existing bubble bubble.updateEntry(entry); + bubble.setSuppressFlyout(suppressFlyout); doUpdate(bubble); } + if (bubble.shouldAutoExpand()) { setSelectedBubbleInternal(bubble); if (!mExpanded) { diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index b68b7627fe8c..31cf853dce04 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -169,7 +169,7 @@ public class BubbleStackView extends FrameLayout { * Callback to run after the flyout hides. Also called if a new flyout is shown before the * previous one animates out. */ - private Runnable mAfterFlyoutHides; + private Runnable mFlyoutOnHide; /** Layout change listener that moves the stack to the nearest valid position on rotation. */ private OnLayoutChangeListener mOrientationChangedListener; @@ -1401,111 +1401,106 @@ public class BubbleStackView extends FrameLayout { @VisibleForTesting void animateInFlyoutForBubble(Bubble bubble) { final CharSequence updateMessage = bubble.getUpdateMessage(getContext()); - if (!bubble.showFlyoutForBubble()) { // In case flyout was suppressed for this update, reset now. bubble.setSuppressFlyout(false); return; } - if (updateMessage == null || isExpanded() || mIsExpansionAnimating || mIsGestureInProgress - || mBubbleToExpandAfterFlyoutCollapse != null) { + || mBubbleToExpandAfterFlyoutCollapse != null + || bubble.getIconView() == null) { // Skip the message if none exists, we're expanded or animating expansion, or we're - // about to expand a bubble from the previous tapped flyout. + // about to expand a bubble from the previous tapped flyout, or if bubble view is null. return; } - - if (bubble.getIconView() != null) { - // Temporarily suppress the dot while the flyout is visible. - bubble.getIconView().setSuppressDot( - true /* suppressDot */, false /* animate */); - - mFlyout.removeCallbacks(mAnimateInFlyout); - mFlyoutDragDeltaX = 0f; - - if (mAfterFlyoutHides != null) { - mAfterFlyoutHides.run(); + mFlyoutDragDeltaX = 0f; + clearFlyoutOnHide(); + mFlyoutOnHide = () -> { + resetDot(bubble); + if (mBubbleToExpandAfterFlyoutCollapse == null) { + return; } - - mAfterFlyoutHides = () -> { - final boolean suppressDot = !bubble.showBubbleDot(); - // If we're going to suppress the dot, make it visible first so it'll - // visibly animate away. - if (suppressDot) { - bubble.getIconView().setSuppressDot( - false /* suppressDot */, false /* animate */); - } - // Reset dot suppression. If we're not suppressing due to DND, then - // stop suppressing it with no animation (since the flyout has - // transformed into the dot). If we are suppressing due to DND, animate - // it away. - bubble.getIconView().setSuppressDot( - suppressDot /* suppressDot */, - suppressDot /* animate */); - - if (mBubbleToExpandAfterFlyoutCollapse != null) { - mBubbleData.setSelectedBubble(mBubbleToExpandAfterFlyoutCollapse); - mBubbleData.setExpanded(true); - mBubbleToExpandAfterFlyoutCollapse = null; - } - }; - - mFlyout.setVisibility(INVISIBLE); - - // Post in case layout isn't complete and getWidth returns 0. - post(() -> { - // An auto-expanding bubble could have been posted during the time it takes to - // layout. - if (isExpanded()) { - return; - } - - final Runnable afterShow = () -> { - mAnimateInFlyout = () -> { - mFlyout.setVisibility(VISIBLE); - bubble.getIconView().setSuppressDot( - true /* suppressDot */, false /* animate */); - mFlyoutDragDeltaX = - mStackAnimationController.isStackOnLeftSide() - ? -mFlyout.getWidth() - : mFlyout.getWidth(); - animateFlyoutCollapsed(false /* collapsed */, 0 /* velX */); - mFlyout.postDelayed(mHideFlyout, FLYOUT_HIDE_AFTER); - }; - - mFlyout.postDelayed(mAnimateInFlyout, 200); + mBubbleData.setSelectedBubble(mBubbleToExpandAfterFlyoutCollapse); + mBubbleData.setExpanded(true); + mBubbleToExpandAfterFlyoutCollapse = null; + }; + mFlyout.setVisibility(INVISIBLE); + + // Temporarily suppress the dot while the flyout is visible. + bubble.getIconView().setSuppressDot( + true /* suppressDot */, false /* animate */); + + // Start flyout expansion. Post in case layout isn't complete and getWidth returns 0. + post(() -> { + // An auto-expanding bubble could have been posted during the time it takes to + // layout. + if (isExpanded()) { + return; + } + final Runnable expandFlyoutAfterDelay = () -> { + mAnimateInFlyout = () -> { + mFlyout.setVisibility(VISIBLE); + mFlyoutDragDeltaX = + mStackAnimationController.isStackOnLeftSide() + ? -mFlyout.getWidth() + : mFlyout.getWidth(); + animateFlyoutCollapsed(false /* collapsed */, 0 /* velX */); + mFlyout.postDelayed(mHideFlyout, FLYOUT_HIDE_AFTER); }; - - mFlyout.setupFlyoutStartingAsDot( - updateMessage, mStackAnimationController.getStackPosition(), getWidth(), - mStackAnimationController.isStackOnLeftSide(), - bubble.getIconView().getBadgeColor(), - afterShow, - mAfterFlyoutHides, - bubble.getIconView().getDotCenter()); - mFlyout.bringToFront(); - }); - } - + mFlyout.postDelayed(mAnimateInFlyout, 200); + }; + mFlyout.setupFlyoutStartingAsDot( + updateMessage, mStackAnimationController.getStackPosition(), getWidth(), + mStackAnimationController.isStackOnLeftSide(), + bubble.getIconView().getBadgeColor() /* dotColor */, + expandFlyoutAfterDelay /* onLayoutComplete */, + mFlyoutOnHide, + bubble.getIconView().getDotCenter()); + mFlyout.bringToFront(); + }); mFlyout.removeCallbacks(mHideFlyout); mFlyout.postDelayed(mHideFlyout, FLYOUT_HIDE_AFTER); logBubbleEvent(bubble, StatsLog.BUBBLE_UICHANGED__ACTION__FLYOUT); } - /** Hide the flyout immediately and cancel any pending hide runnables. */ - private void hideFlyoutImmediate() { - if (mAfterFlyoutHides != null) { - mAfterFlyoutHides.run(); + private void resetDot(Bubble bubble) { + final boolean suppressDot = !bubble.showBubbleDot(); + // If we're going to suppress the dot, make it visible first so it'll + // visibly animate away. + + if (suppressDot) { + bubble.getIconView().setSuppressDot( + false /* suppressDot */, false /* animate */); } + // Reset dot suppression. If we're not suppressing due to DND, then + // stop suppressing it with no animation (since the flyout has + // transformed into the dot). If we are suppressing due to DND, animate + // it away. + bubble.getIconView().setSuppressDot( + suppressDot /* suppressDot */, + suppressDot /* animate */); + } + /** Hide the flyout immediately and cancel any pending hide runnables. */ + private void hideFlyoutImmediate() { + clearFlyoutOnHide(); mFlyout.removeCallbacks(mAnimateInFlyout); mFlyout.removeCallbacks(mHideFlyout); mFlyout.hideFlyout(); } + private void clearFlyoutOnHide() { + mFlyout.removeCallbacks(mAnimateInFlyout); + if (mFlyoutOnHide == null) { + return; + } + mFlyoutOnHide.run(); + mFlyoutOnHide = null; + } + @Override public void getBoundsOnScreen(Rect outRect) { if (!mIsExpanded) { diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java index 603c4169c169..4512aa822e3b 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java @@ -61,7 +61,7 @@ public class BubbleView extends FrameLayout { // mBubbleIconFactory cannot be static because it depends on Context. private BubbleIconFactory mBubbleIconFactory; - private boolean mSuppressDot = false; + private boolean mSuppressDot; private Bubble mBubble; @@ -140,6 +140,7 @@ public class BubbleView extends FrameLayout { public void setAppIcon(Drawable appIcon) { mUserBadgedAppIcon = appIcon; } + /** * @return the {@link ExpandableNotificationRow} view to display notification content when the * bubble is expanded. @@ -154,7 +155,6 @@ public class BubbleView extends FrameLayout { updateDotVisibility(animate, null /* after */); } - /** * Sets whether or not to hide the dot even if we'd otherwise show it. This is used while the * flyout is visible or animating, to hide the dot until the flyout visually transforms into it. @@ -166,7 +166,7 @@ public class BubbleView extends FrameLayout { /** Sets the position of the 'new' dot, animating it out and back in if requested. */ void setDotPosition(boolean onLeft, boolean animate) { - if (animate && onLeft != mBadgedImageView.getDotOnLeft() && !mSuppressDot) { + if (animate && onLeft != mBadgedImageView.getDotOnLeft() && shouldShowDot()) { animateDot(false /* showDot */, () -> { mBadgedImageView.setDotOnLeft(onLeft); animateDot(true /* showDot */, null); @@ -190,12 +190,12 @@ public class BubbleView extends FrameLayout { * after animation if requested. */ private void updateDotVisibility(boolean animate, Runnable after) { - boolean showDot = mBubble.showBubbleDot() && !mSuppressDot; - + final boolean showDot = shouldShowDot(); if (animate) { animateDot(showDot, after); } else { mBadgedImageView.setShowDot(showDot); + mBadgedImageView.setDotScale(showDot ? 1f : 0f); } } @@ -203,27 +203,25 @@ public class BubbleView extends FrameLayout { * Animates the badge to show or hide. */ private void animateDot(boolean showDot, Runnable after) { - if (mBadgedImageView.isShowingDot() != showDot) { - if (showDot) { - mBadgedImageView.setShowDot(true); - } - mBadgedImageView.clearAnimation(); - mBadgedImageView.animate().setDuration(200) - .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) - .setUpdateListener((valueAnimator) -> { - float fraction = valueAnimator.getAnimatedFraction(); - fraction = showDot ? fraction : 1f - fraction; - mBadgedImageView.setDotScale(fraction); - }).withEndAction(() -> { - if (!showDot) { - mBadgedImageView.setShowDot(false); - } - - if (after != null) { - after.run(); - } - }).start(); + if (mBadgedImageView.isShowingDot() == showDot) { + return; } + // Do NOT wait until after animation ends to setShowDot + // to avoid overriding more recent showDot states. + mBadgedImageView.setShowDot(showDot); + mBadgedImageView.clearAnimation(); + mBadgedImageView.animate().setDuration(200) + .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) + .setUpdateListener((valueAnimator) -> { + float fraction = valueAnimator.getAnimatedFraction(); + fraction = showDot ? fraction : 1f - fraction; + mBadgedImageView.setDotScale(fraction); + }).withEndAction(() -> { + mBadgedImageView.setDotScale(showDot ? 1f : 0f); + if (after != null) { + after.run(); + } + }).start(); } void updateViews() { @@ -273,7 +271,11 @@ public class BubbleView extends FrameLayout { iconPath.transform(matrix); mBadgedImageView.drawDot(iconPath); - animateDot(mBubble.showBubbleDot() /* showDot */, null /* after */); + animateDot(shouldShowDot(), null /* after */); + } + + boolean shouldShowDot() { + return mBubble.showBubbleDot() && !mSuppressDot; } int getBadgeColor() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 6f87b2939cfb..f3ae50b4ca23 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -108,6 +108,7 @@ public class KeyguardIndicationController implements StateListener, private ColorStateList mTransientTextColorState; private ColorStateList mInitialTextColorState; private boolean mVisible; + private boolean mHideTransientMessageOnScreenOff; private boolean mPowerPluggedIn; private boolean mPowerPluggedInWired; @@ -317,15 +318,17 @@ public class KeyguardIndicationController implements StateListener, * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}. */ public void showTransientIndication(CharSequence transientIndication) { - showTransientIndication(transientIndication, mInitialTextColorState); + showTransientIndication(transientIndication, mInitialTextColorState, + false /* hideOnScreenOff */); } /** * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}. */ - public void showTransientIndication(CharSequence transientIndication, - ColorStateList textColorState) { + private void showTransientIndication(CharSequence transientIndication, + ColorStateList textColorState, boolean hideOnScreenOff) { mTransientIndication = transientIndication; + mHideTransientMessageOnScreenOff = hideOnScreenOff && transientIndication != null; mTransientTextColorState = textColorState; mHandler.removeMessages(MSG_HIDE_TRANSIENT); mHandler.removeMessages(MSG_SWIPE_UP_TO_UNLOCK); @@ -344,6 +347,7 @@ public class KeyguardIndicationController implements StateListener, public void hideTransientIndication() { if (mTransientIndication != null) { mTransientIndication = null; + mHideTransientMessageOnScreenOff = false; mHandler.removeMessages(MSG_HIDE_TRANSIENT); updateIndication(false); } @@ -566,7 +570,8 @@ public class KeyguardIndicationController implements StateListener, String message = mContext.getString(R.string.keyguard_retry); mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState); } else if (mKeyguardUpdateMonitor.isScreenOn()) { - showTransientIndication(mContext.getString(R.string.keyguard_unlock)); + showTransientIndication(mContext.getString(R.string.keyguard_unlock), + mInitialTextColorState, true /* hideOnScreenOff */); hideTransientIndicationDelayed(BaseKeyguardCallback.HIDE_DELAY_MS); } } @@ -576,7 +581,11 @@ public class KeyguardIndicationController implements StateListener, return; } mDozing = dozing; - updateIndication(false); + if (mHideTransientMessageOnScreenOff && mDozing) { + hideTransientIndication(); + } else { + updateIndication(false); + } updateDisclosure(); } @@ -646,8 +655,7 @@ public class KeyguardIndicationController implements StateListener, @Override public void onBiometricHelp(int msgId, String helpString, BiometricSourceType biometricSourceType) { - KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext); - if (!updateMonitor.isUnlockingWithBiometricAllowed()) { + if (!mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed()) { return; } boolean showSwipeToUnlock = @@ -655,8 +663,8 @@ public class KeyguardIndicationController implements StateListener, if (mStatusBarKeyguardViewManager.isBouncerShowing()) { mStatusBarKeyguardViewManager.showBouncerMessage(helpString, mInitialTextColorState); - } else if (updateMonitor.isScreenOn()) { - showTransientIndication(helpString); + } else if (mKeyguardUpdateMonitor.isScreenOn()) { + showTransientIndication(helpString, mInitialTextColorState, showSwipeToUnlock); if (!showSwipeToUnlock) { hideTransientIndicationDelayed(TRANSIENT_BIOMETRIC_ERROR_TIMEOUT); } @@ -670,8 +678,7 @@ public class KeyguardIndicationController implements StateListener, @Override public void onBiometricError(int msgId, String errString, BiometricSourceType biometricSourceType) { - KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext); - if (shouldSuppressBiometricError(msgId, biometricSourceType, updateMonitor)) { + if (shouldSuppressBiometricError(msgId, biometricSourceType, mKeyguardUpdateMonitor)) { return; } animatePadlockError(); @@ -681,7 +688,7 @@ public class KeyguardIndicationController implements StateListener, showSwipeUpToUnlock(); } else if (mStatusBarKeyguardViewManager.isBouncerShowing()) { mStatusBarKeyguardViewManager.showBouncerMessage(errString, mInitialTextColorState); - } else if (updateMonitor.isScreenOn()) { + } else if (mKeyguardUpdateMonitor.isScreenOn()) { showTransientIndication(errString); // We want to keep this message around in case the screen was off hideTransientIndicationDelayed(HIDE_DELAY_MS); @@ -721,13 +728,15 @@ public class KeyguardIndicationController implements StateListener, @Override public void onTrustAgentErrorMessage(CharSequence message) { - showTransientIndication(message, Utils.getColorError(mContext)); + showTransientIndication(message, Utils.getColorError(mContext), + false /* hideOnScreenOff */); } @Override public void onScreenTurnedOn() { if (mMessageToShowOnScreenOn != null) { - showTransientIndication(mMessageToShowOnScreenOn, Utils.getColorError(mContext)); + showTransientIndication(mMessageToShowOnScreenOn, Utils.getColorError(mContext), + false /* hideOnScreenOff */); // We want to keep this message around in case the screen was off hideTransientIndicationDelayed(HIDE_DELAY_MS); mMessageToShowOnScreenOn = null; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java index 689d161c2ee8..239addd4ee1d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java @@ -208,11 +208,9 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, @Override public void onDarkChanged(Rect area, float darkIntensity, int tint) { - if (!isInArea(area, this)) { - return; - } + float intensity = isInArea(area, this) ? darkIntensity : 0; mMobileDrawable.setTintList( - ColorStateList.valueOf(mDualToneHandler.getSingleColor(darkIntensity))); + ColorStateList.valueOf(mDualToneHandler.getSingleColor(intensity))); ColorStateList color = ColorStateList.valueOf(getTint(area, this, tint)); mIn.setImageTintList(color); mOut.setImageTintList(color); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java index 23e2d277034d..6dbcc44e385b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java @@ -236,15 +236,13 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, @Override public void onDarkChanged(Rect area, float darkIntensity, int tint) { - if (!isInArea(area, this)) { - return; - } - - mWifiIcon.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); - mIn.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); - mOut.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); - mDotView.setDecorColor(tint); - mDotView.setIconColor(tint, false); + int areaTint = getTint(area, this, tint); + ColorStateList color = ColorStateList.valueOf(areaTint); + mWifiIcon.setImageTintList(color); + mIn.setImageTintList(color); + mOut.setImageTintList(color); + mDotView.setDecorColor(areaTint); + mDotView.setIconColor(areaTint, false); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java index 00092929fd49..299511c8f2da 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java @@ -57,7 +57,6 @@ public class NotificationData { private final ArrayMap<String, NotificationEntry> mEntries = new ArrayMap<>(); private final ArrayList<NotificationEntry> mSortedAndFiltered = new ArrayList<>(); - private final ArrayList<NotificationEntry> mFilteredForUser = new ArrayList<>(); private final NotificationGroupManager mGroupManager = Dependency.get(NotificationGroupManager.class); @@ -166,20 +165,20 @@ public class NotificationData { } public ArrayList<NotificationEntry> getNotificationsForCurrentUser() { - mFilteredForUser.clear(); - synchronized (mEntries) { final int len = mEntries.size(); + ArrayList<NotificationEntry> filteredForUser = new ArrayList<>(len); + for (int i = 0; i < len; i++) { NotificationEntry entry = mEntries.valueAt(i); final StatusBarNotification sbn = entry.notification; if (!getEnvironment().isNotificationForCurrentProfiles(sbn)) { continue; } - mFilteredForUser.add(entry); + filteredForUser.add(entry); } + return filteredForUser; } - return mFilteredForUser; } public NotificationEntry get(String key) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index 027e8e426c4b..121508b877d2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -155,6 +155,12 @@ public final class NotificationEntry { public boolean canBubble; /** + * Whether this notification has changed in visual appearance since the previous post. + * New notifications are interruptive by default. + */ + public boolean isVisuallyInterruptive; + + /** * Whether this notification is shown to the user as a high priority notification: visible on * the lock screen/status bar and in the top section in the shade. */ @@ -196,6 +202,7 @@ public final class NotificationEntry { suppressedVisualEffects = ranking.getSuppressedVisualEffects(); suspended = ranking.isSuspended(); canBubble = ranking.canBubble(); + isVisuallyInterruptive = ranking.visuallyInterruptive(); } public void setInterruption() { 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 ed0b9d929466..919ca12648ed 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java @@ -22,6 +22,7 @@ import android.text.TextPaint; import android.text.method.TransformationMethod; import android.util.AttributeSet; import android.util.Log; +import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -238,13 +239,15 @@ public class SmartReplyView extends ViewGroup { public List<Button> inflateSmartActions(Context packageContext, @NonNull SmartActions smartActions, SmartReplyController smartReplyController, NotificationEntry entry, HeadsUpManager headsUpManager, boolean delayOnClickListener) { + Context themedPackageContext = new ContextThemeWrapper(packageContext, mContext.getTheme()); List<Button> buttons = new ArrayList<>(); int numSmartActions = smartActions.actions.size(); for (int n = 0; n < numSmartActions; n++) { Notification.Action action = smartActions.actions.get(n); if (action.actionIntent != null) { buttons.add(inflateActionButton( - this, getContext(), packageContext, n, smartActions, smartReplyController, + this, getContext(), themedPackageContext, n, smartActions, + smartReplyController, entry, headsUpManager, delayOnClickListener)); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java index daee55bd3d61..c85e51545bc1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java @@ -35,8 +35,11 @@ import android.app.admin.DevicePolicyManager; import android.app.trust.TrustManager; import android.content.Context; import android.graphics.Color; +import android.hardware.biometrics.BiometricSourceType; +import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; import android.os.Looper; +import android.os.UserManager; import android.view.View; import android.view.ViewGroup; @@ -53,6 +56,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.phone.KeyguardIndicationTextView; import com.android.systemui.statusbar.phone.LockIcon; import com.android.systemui.statusbar.phone.ShadeController; +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.phone.UnlockMethodCache; import com.android.systemui.statusbar.policy.AccessibilityController; import com.android.systemui.util.wakelock.WakeLockFake; @@ -92,6 +96,10 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { private StatusBarStateController mStatusBarStateController; @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; + @Mock + private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; + @Mock + private UserManager mUserManager; private KeyguardIndicationTextView mTextView; private KeyguardIndicationController mController; @@ -105,14 +113,18 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { mTextView = new KeyguardIndicationTextView(mContext); mContext.addMockSystemService(Context.DEVICE_POLICY_SERVICE, mDevicePolicyManager); + mContext.addMockSystemService(UserManager.class, mUserManager); mContext.addMockSystemService(Context.TRUST_SERVICE, mock(TrustManager.class)); mContext.addMockSystemService(Context.FINGERPRINT_SERVICE, mock(FingerprintManager.class)); mDisclosureWithOrganization = mContext.getString(R.string.do_disclosure_with_name, ORGANIZATION_NAME); + when(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed()).thenReturn(true); + when(mKeyguardUpdateMonitor.isScreenOn()).thenReturn(true); when(mIndicationArea.findViewById(R.id.keyguard_indication_enterprise_disclosure)) .thenReturn(mDisclosure); when(mIndicationArea.findViewById(R.id.keyguard_indication_text)).thenReturn(mTextView); + when(mUserManager.isUserUnlocked(anyInt())).thenReturn(true); mWakeLock = new WakeLockFake(); } @@ -124,6 +136,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { mController = new KeyguardIndicationController(mContext, mIndicationArea, mLockIcon, mLockPatternUtils, mWakeLock, mShadeController, mAccessibilityController, mUnlockMethodCache, mStatusBarStateController, mKeyguardUpdateMonitor); + mController.setStatusBarKeyguardViewManager(mStatusBarKeyguardViewManager); } @Test @@ -245,6 +258,49 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { } @Test + public void transientIndication_visibleWhenDozing_unlessSwipeUp_fromHelp() { + createController(); + String message = "A message"; + + mController.setVisible(true); + mController.getKeyguardCallback().onBiometricHelp( + KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED, message, + BiometricSourceType.FACE); + assertThat(mTextView.getText()).isEqualTo(message); + mController.setDozing(true); + + assertThat(mTextView.getText()).isNotEqualTo(message); + } + + @Test + public void transientIndication_visibleWhenDozing_unlessSwipeUp_fromError() { + createController(); + String message = mContext.getString(R.string.keyguard_unlock); + + mController.setVisible(true); + mController.getKeyguardCallback().onBiometricError(FaceManager.FACE_ERROR_TIMEOUT, + "A message", BiometricSourceType.FACE); + + assertThat(mTextView.getText()).isEqualTo(message); + mController.setDozing(true); + + assertThat(mTextView.getText()).isNotEqualTo(message); + } + + @Test + public void transientIndication_swipeUpToRetry() { + createController(); + String message = mContext.getString(R.string.keyguard_retry); + when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(true); + + mController.setVisible(true); + mController.getKeyguardCallback().onBiometricError(FaceManager.FACE_ERROR_TIMEOUT, + "A message", BiometricSourceType.FACE); + + verify(mStatusBarKeyguardViewManager).showBouncerMessage(eq(message), any()); + } + + @Test public void lockIcon_click() { createController(); 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 2ca1b0611cd6..b07ac5ff7ea8 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 @@ -182,7 +182,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase { 0, NotificationManager.IMPORTANCE_DEFAULT, null, null, - null, null, null, true, sentiment, false, -1, false, null, null, false); + null, null, null, true, sentiment, false, -1, false, null, null, false, false); return true; }).when(mRankingMap).getRanking(eq(key), any(NotificationListenerService.Ranking.class)); } @@ -201,7 +201,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase { null, null, null, null, null, true, NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL, false, -1, - false, smartActions, null, false); + false, smartActions, null, false, false); return true; }).when(mRankingMap).getRanking(eq(key), any(NotificationListenerService.Ranking.class)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java index e2d8e5698daf..cf0c7185f040 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java @@ -623,6 +623,7 @@ public class NotificationDataTest extends SysuiTestCase { public static final String OVERRIDE_SMART_ACTIONS = "sa"; public static final String OVERRIDE_SMART_REPLIES = "sr"; public static final String OVERRIDE_BUBBLE = "cb"; + public static final String OVERRIDE_VISUALLY_INTERRUPTIVE = "vi"; public Map<String, Bundle> rankingOverrides = new HashMap<>(); @@ -683,7 +684,9 @@ public class NotificationDataTest extends SysuiTestCase { overrides.containsKey(OVERRIDE_SMART_REPLIES) ? overrides.getCharSequenceArrayList(OVERRIDE_SMART_REPLIES) : currentReplies, - overrides.getBoolean(OVERRIDE_BUBBLE, outRanking.canBubble())); + overrides.getBoolean(OVERRIDE_BUBBLE, outRanking.canBubble()), + overrides.getBoolean(OVERRIDE_VISUALLY_INTERRUPTIVE, + outRanking.visuallyInterruptive())); } return true; } diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp index 998572fc5679..61bfb92363bd 100644 --- a/packages/Tethering/Android.bp +++ b/packages/Tethering/Android.bp @@ -27,6 +27,7 @@ java_defaults { "androidx.annotation_annotation", "netd_aidl_interface-java", "networkstack-aidl-interfaces-java", + "android.hardware.tetheroffload.control-V1.0-java", "tethering-client", ], manifest: "AndroidManifestBase.xml", @@ -38,11 +39,39 @@ android_library { defaults: ["TetheringAndroidLibraryDefaults"], } +cc_library_shared { + name: "libtetheroffloadjni", + srcs: [ + "jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp", + ], + shared_libs: [ + "libnativehelper", + "libcutils", + "android.hardware.tetheroffload.config@1.0", + ], + static_libs: [ + "liblog", + "libbase", + "libhidlbase", + "libutils", + ], + + cflags: [ + "-Wall", + "-Werror", + "-Wno-unused-parameter", + "-Wthread-safety", + ], +} + // Common defaults for compiling the actual APK. java_defaults { name: "TetheringAppDefaults", platform_apis: true, privileged: true, + jni_libs: [ + "libtetheroffloadjni", + ], resource_dirs: [ "res", ], @@ -71,6 +100,8 @@ filegroup { name: "tethering-servicescore-srcs", srcs: [ "src/com/android/server/connectivity/tethering/EntitlementManager.java", + "src/com/android/server/connectivity/tethering/OffloadController.java", + "src/com/android/server/connectivity/tethering/OffloadHardwareInterface.java", "src/com/android/server/connectivity/tethering/TetheringConfiguration.java", "src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java", ], @@ -88,3 +119,11 @@ filegroup { "src/android/net/util/PrefixUtils.java", ], } + +// This group would be removed when tethering migration is done. +filegroup { + name: "tethering-jni-srcs", + srcs: [ + "jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp", + ], +} diff --git a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp b/packages/Tethering/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp index 3eaf48845a2f..3eaf48845a2f 100644 --- a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp +++ b/packages/Tethering/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp diff --git a/services/core/java/com/android/server/connectivity/tethering/OffloadController.java b/packages/Tethering/src/com/android/server/connectivity/tethering/OffloadController.java index a3c299814a7a..16734d83e3aa 100644 --- a/services/core/java/com/android/server/connectivity/tethering/OffloadController.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/OffloadController.java @@ -36,8 +36,8 @@ import android.net.netlink.NetlinkSocket; import android.net.util.IpUtils; import android.net.util.SharedLog; import android.os.Handler; -import android.os.Looper; import android.os.INetworkManagementService; +import android.os.Looper; import android.os.RemoteException; import android.os.SystemClock; import android.provider.Settings; @@ -60,7 +60,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; /** * A class to encapsulate the business logic of programming the tethering @@ -74,7 +73,7 @@ public class OffloadController { private static final String ANYIP = "0.0.0.0"; private static final ForwardedStats EMPTY_STATS = new ForwardedStats(); - private static enum UpdateType { IF_NEEDED, FORCE }; + private enum UpdateType { IF_NEEDED, FORCE }; private final Handler mHandler; private final OffloadHardwareInterface mHwInterface; @@ -128,6 +127,7 @@ public class OffloadController { } } + /** Start hardware offload. */ public boolean start() { if (started()) return true; @@ -235,6 +235,7 @@ public class OffloadController { return isStarted; } + /** Stop hardware offload. */ public void stop() { // Completely stops tethering offload. After this method is called, it is no longer safe to // call any HAL method, no callbacks from the hardware will be delivered, and any in-flight @@ -258,7 +259,9 @@ public class OffloadController { // getTetherStats() is the only function in OffloadController that can be called from // a different thread. Do not attempt to update stats by querying the offload HAL // synchronously from a different thread than our Handler thread. http://b/64771555. - Runnable updateStats = () -> { updateStatsForCurrentUpstream(); }; + Runnable updateStats = () -> { + updateStatsForCurrentUpstream(); + }; if (Looper.myLooper() == mHandler.getLooper()) { updateStats.run(); } else { @@ -358,6 +361,7 @@ public class OffloadController { } } + /** Set current tethering upstream LinkProperties. */ public void setUpstreamLinkProperties(LinkProperties lp) { if (!started() || Objects.equals(mUpstreamLinkProperties, lp)) return; @@ -376,6 +380,7 @@ public class OffloadController { pushUpstreamParameters(prevUpstream); } + /** Set local prefixes. */ public void setLocalPrefixes(Set<IpPrefix> localPrefixes) { mExemptPrefixes = localPrefixes; @@ -383,6 +388,7 @@ public class OffloadController { computeAndPushLocalPrefixes(UpdateType.IF_NEEDED); } + /** Update current downstream LinkProperties. */ public void notifyDownstreamLinkProperties(LinkProperties lp) { final String ifname = lp.getInterfaceName(); final LinkProperties oldLp = mDownstreams.put(ifname, new LinkProperties(lp)); @@ -421,6 +427,7 @@ public class OffloadController { } } + /** Remove downstream interface from offload hardware. */ public void removeDownstreamInterface(String ifname) { final LinkProperties lp = mDownstreams.remove(ifname); if (lp == null) return; @@ -481,7 +488,7 @@ public class OffloadController { iface, v4addr, v4gateway, (v6gateways.isEmpty() ? null : v6gateways)); if (!success) { - return success; + return success; } // Update stats after we've told the hardware to change routing so we don't miss packets. @@ -545,6 +552,7 @@ public class OffloadController { return false; } + /** Dump information. */ public void dump(IndentingPrintWriter pw) { if (isOffloadDisabled()) { pw.println("Offload disabled"); @@ -630,7 +638,7 @@ public class OffloadController { if (ip instanceof Inet4Address) { return (Inet4Address) ip; } - } catch (IllegalArgumentException iae) {} + } catch (IllegalArgumentException iae) { } return null; } diff --git a/services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java b/packages/Tethering/src/com/android/server/connectivity/tethering/OffloadHardwareInterface.java index 207f86762b95..01339a4a2c33 100644 --- a/services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/OffloadHardwareInterface.java @@ -23,9 +23,9 @@ import android.hardware.tetheroffload.control.V1_0.ITetheringOffloadCallback; import android.hardware.tetheroffload.control.V1_0.NatTimeoutUpdate; import android.hardware.tetheroffload.control.V1_0.NetworkProtocol; import android.hardware.tetheroffload.control.V1_0.OffloadCallbackEvent; +import android.net.util.SharedLog; import android.os.Handler; import android.os.RemoteException; -import android.net.util.SharedLog; import android.system.OsConstants; import java.util.ArrayList; @@ -55,18 +55,34 @@ public class OffloadHardwareInterface { private TetheringOffloadCallback mTetheringOffloadCallback; private ControlCallback mControlCallback; + /** The callback to notify status of offload management process. */ public static class ControlCallback { + /** Offload started. */ public void onStarted() {} + /** + * Offload stopped because an error has occurred in lower layer. + */ public void onStoppedError() {} + /** + * Offload stopped because the device has moved to a bearer on which hardware offload is + * not supported. Subsequent calls to setUpstreamParameters and add/removeDownstream will + * likely fail and cannot be presumed to be saved inside of the hardware management process. + * Upon receiving #onSupportAvailable(), the caller should reprogram the hardware to begin + * offload again. + */ public void onStoppedUnsupported() {} + /** Indicate that offload is able to proivde support for this time. */ public void onSupportAvailable() {} + /** Offload stopped because of usage limit reached. */ public void onStoppedLimitReached() {} + /** Indicate to update NAT timeout. */ public void onNatTimeoutUpdate(int proto, String srcAddr, int srcPort, String dstAddr, int dstPort) {} } + /** The object which records Tx/Rx forwarded bytes. */ public static class ForwardedStats { public long rxBytes; public long txBytes; @@ -76,11 +92,13 @@ public class OffloadHardwareInterface { txBytes = 0; } + /** Add Tx/Rx bytes. */ public void add(ForwardedStats other) { rxBytes += other.rxBytes; txBytes += other.txBytes; } + /** Returns the string representation of this object. */ public String toString() { return String.format("rx:%s tx:%s", rxBytes, txBytes); } @@ -91,14 +109,17 @@ public class OffloadHardwareInterface { mLog = log.forSubComponent(TAG); } + /** Get default value indicating whether offload is supported. */ public int getDefaultTetherOffloadDisabled() { return DEFAULT_TETHER_OFFLOAD_DISABLED; } + /** Configure offload management process. */ public boolean initOffloadConfig() { return configOffload(); } + /** Initialize the tethering offload HAL. */ public boolean initOffloadControl(ControlCallback controlCb) { mControlCallback = controlCb; @@ -125,8 +146,8 @@ public class OffloadHardwareInterface { mOffloadControl.initOffload( mTetheringOffloadCallback, (boolean success, String errMsg) -> { - results.success = success; - results.errMsg = errMsg; + results.mSuccess = success; + results.mErrMsg = errMsg; }); } catch (RemoteException e) { record(logmsg, e); @@ -134,9 +155,10 @@ public class OffloadHardwareInterface { } record(logmsg, results); - return results.success; + return results.mSuccess; } + /** Stop IOffloadControl. */ public void stopOffloadControl() { if (mOffloadControl != null) { try { @@ -154,6 +176,7 @@ public class OffloadHardwareInterface { mLog.log("stopOffloadControl()"); } + /** Get Tx/Rx usage from last query. */ public ForwardedStats getForwardedStats(String upstream) { final String logmsg = String.format("getForwardedStats(%s)", upstream); @@ -174,6 +197,7 @@ public class OffloadHardwareInterface { return stats; } + /** Set local prefixes to offload management process. */ public boolean setLocalPrefixes(ArrayList<String> localPrefixes) { final String logmsg = String.format("setLocalPrefixes([%s])", String.join(",", localPrefixes)); @@ -182,8 +206,8 @@ public class OffloadHardwareInterface { try { mOffloadControl.setLocalPrefixes(localPrefixes, (boolean success, String errMsg) -> { - results.success = success; - results.errMsg = errMsg; + results.mSuccess = success; + results.mErrMsg = errMsg; }); } catch (RemoteException e) { record(logmsg, e); @@ -191,9 +215,10 @@ public class OffloadHardwareInterface { } record(logmsg, results); - return results.success; + return results.mSuccess; } + /** Set data limit value to offload management process. */ public boolean setDataLimit(String iface, long limit) { final String logmsg = String.format("setDataLimit(%s, %d)", iface, limit); @@ -203,8 +228,8 @@ public class OffloadHardwareInterface { mOffloadControl.setDataLimit( iface, limit, (boolean success, String errMsg) -> { - results.success = success; - results.errMsg = errMsg; + results.mSuccess = success; + results.mErrMsg = errMsg; }); } catch (RemoteException e) { record(logmsg, e); @@ -212,9 +237,10 @@ public class OffloadHardwareInterface { } record(logmsg, results); - return results.success; + return results.mSuccess; } + /** Set upstream parameters to offload management process. */ public boolean setUpstreamParameters( String iface, String v4addr, String v4gateway, ArrayList<String> v6gws) { iface = (iface != null) ? iface : NO_INTERFACE_NAME; @@ -230,8 +256,8 @@ public class OffloadHardwareInterface { mOffloadControl.setUpstreamParameters( iface, v4addr, v4gateway, v6gws, (boolean success, String errMsg) -> { - results.success = success; - results.errMsg = errMsg; + results.mSuccess = success; + results.mErrMsg = errMsg; }); } catch (RemoteException e) { record(logmsg, e); @@ -239,9 +265,10 @@ public class OffloadHardwareInterface { } record(logmsg, results); - return results.success; + return results.mSuccess; } + /** Add downstream prefix to offload management process. */ public boolean addDownstreamPrefix(String ifname, String prefix) { final String logmsg = String.format("addDownstreamPrefix(%s, %s)", ifname, prefix); @@ -249,8 +276,8 @@ public class OffloadHardwareInterface { try { mOffloadControl.addDownstream(ifname, prefix, (boolean success, String errMsg) -> { - results.success = success; - results.errMsg = errMsg; + results.mSuccess = success; + results.mErrMsg = errMsg; }); } catch (RemoteException e) { record(logmsg, e); @@ -258,9 +285,10 @@ public class OffloadHardwareInterface { } record(logmsg, results); - return results.success; + return results.mSuccess; } + /** Remove downstream prefix from offload management process. */ public boolean removeDownstreamPrefix(String ifname, String prefix) { final String logmsg = String.format("removeDownstreamPrefix(%s, %s)", ifname, prefix); @@ -268,8 +296,8 @@ public class OffloadHardwareInterface { try { mOffloadControl.removeDownstream(ifname, prefix, (boolean success, String errMsg) -> { - results.success = success; - results.errMsg = errMsg; + results.mSuccess = success; + results.mErrMsg = errMsg; }); } catch (RemoteException e) { record(logmsg, e); @@ -277,7 +305,7 @@ public class OffloadHardwareInterface { } record(logmsg, results); - return results.success; + return results.mSuccess; } private void record(String msg, Throwable t) { @@ -286,7 +314,7 @@ public class OffloadHardwareInterface { private void record(String msg, CbResults results) { final String logmsg = msg + YIELDS + results; - if (!results.success) { + if (!results.mSuccess) { mLog.e(logmsg); } else { mLog.log(logmsg); @@ -298,7 +326,7 @@ public class OffloadHardwareInterface { public final ControlCallback controlCb; public final SharedLog log; - public TetheringOffloadCallback(Handler h, ControlCallback cb, SharedLog sharedLog) { + TetheringOffloadCallback(Handler h, ControlCallback cb, SharedLog sharedLog) { handler = h; controlCb = cb; log = sharedLog; @@ -332,7 +360,7 @@ public class OffloadHardwareInterface { @Override public void updateTimeout(NatTimeoutUpdate params) { handler.post(() -> { - controlCb.onNatTimeoutUpdate( + controlCb.onNatTimeoutUpdate( networkProtocolToOsConstant(params.proto), params.src.addr, uint16(params.src.port), params.dst.addr, uint16(params.dst.port)); @@ -352,15 +380,15 @@ public class OffloadHardwareInterface { } private static class CbResults { - boolean success; - String errMsg; + boolean mSuccess; + String mErrMsg; @Override public String toString() { - if (success) { + if (mSuccess) { return "ok"; } else { - return "fail: " + errMsg; + return "fail: " + mErrMsg; } } } diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp index 7c06e5f0d7ce..363be18a73bc 100644 --- a/packages/Tethering/tests/unit/Android.bp +++ b/packages/Tethering/tests/unit/Android.bp @@ -25,6 +25,7 @@ android_test { static_libs: [ "androidx.test.rules", "frameworks-base-testutils", + "net-tests-utils", "mockito-target-extended-minus-junit4", "TetheringApiCurrentLib", "testables", @@ -46,6 +47,7 @@ filegroup { name: "tethering-tests-src", srcs: [ "src/com/android/server/connectivity/tethering/EntitlementManagerTest.java", + "src/com/android/server/connectivity/tethering/OffloadControllerTest.java", "src/com/android/server/connectivity/tethering/TetheringConfigurationTest.java", "src/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java", "src/android/net/dhcp/DhcpServingParamsParcelExtTest.java", diff --git a/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java b/packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/OffloadControllerTest.java index 9931aec01487..8574f5401496 100644 --- a/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java +++ b/packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/OffloadControllerTest.java @@ -26,10 +26,10 @@ import static android.provider.Settings.Global.TETHER_OFFLOAD_DISABLED; import static com.android.server.connectivity.tethering.OffloadHardwareInterface.ForwardedStats; import static com.android.testutils.MiscAssertsKt.assertContainsAll; +import static com.android.testutils.MiscAssertsKt.assertThrows; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyObject; @@ -148,10 +148,8 @@ public class OffloadControllerTest { public void testNoSettingsValueDefaultDisabledDoesNotStart() throws Exception { setupFunctioningHardwareInterface(); when(mHardware.getDefaultTetherOffloadDisabled()).thenReturn(1); - try { - Settings.Global.getInt(mContentResolver, TETHER_OFFLOAD_DISABLED); - fail(); - } catch (SettingNotFoundException expected) {} + assertThrows(SettingNotFoundException.class, () -> + Settings.Global.getInt(mContentResolver, TETHER_OFFLOAD_DISABLED)); final OffloadController offload = makeOffloadController(); offload.start(); @@ -168,10 +166,8 @@ public class OffloadControllerTest { public void testNoSettingsValueDefaultEnabledDoesStart() throws Exception { setupFunctioningHardwareInterface(); when(mHardware.getDefaultTetherOffloadDisabled()).thenReturn(0); - try { - Settings.Global.getInt(mContentResolver, TETHER_OFFLOAD_DISABLED); - fail(); - } catch (SettingNotFoundException expected) {} + assertThrows(SettingNotFoundException.class, () -> + Settings.Global.getInt(mContentResolver, TETHER_OFFLOAD_DISABLED)); final OffloadController offload = makeOffloadController(); offload.start(); diff --git a/services/core/java/com/android/server/AppStateTracker.java b/services/core/java/com/android/server/AppStateTracker.java index 3a7b5d683507..207e007cc62f 100644 --- a/services/core/java/com/android/server/AppStateTracker.java +++ b/services/core/java/com/android/server/AppStateTracker.java @@ -700,14 +700,16 @@ public class AppStateTracker { Slog.d(TAG,"onAppIdleStateChanged: " + packageName + " u" + userId + (idle ? " idle" : " active") + " " + bucket); } - final boolean changed; - if (bucket == UsageStatsManager.STANDBY_BUCKET_EXEMPTED) { - changed = mExemptedPackages.add(userId, packageName); - } else { - changed = mExemptedPackages.remove(userId, packageName); - } - if (changed) { - mHandler.notifyExemptChanged(); + synchronized (mLock) { + final boolean changed; + if (bucket == UsageStatsManager.STANDBY_BUCKET_EXEMPTED) { + changed = mExemptedPackages.add(userId, packageName); + } else { + changed = mExemptedPackages.remove(userId, packageName); + } + if (changed) { + mHandler.notifyExemptChanged(); + } } } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ce0e9e7e56cf..81eb4b355a21 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -97,6 +97,7 @@ import android.net.NetworkMonitorManager; import android.net.NetworkPolicyManager; import android.net.NetworkQuotaInfo; import android.net.NetworkRequest; +import android.net.NetworkScore; import android.net.NetworkSpecifier; import android.net.NetworkStack; import android.net.NetworkStackClient; @@ -2643,7 +2644,8 @@ public class ConnectivityService extends IConnectivityManager.Stub break; } case NetworkAgent.EVENT_NETWORK_SCORE_CHANGED: { - updateNetworkScore(nai, msg.arg1); + final NetworkScore ns = (NetworkScore) msg.obj; + updateNetworkScore(nai, ns); break; } case NetworkAgent.EVENT_SET_EXPLICITLY_SELECTED: { @@ -5594,9 +5596,11 @@ public class ConnectivityService extends IConnectivityManager.Stub // TODO: Instead of passing mDefaultRequest, provide an API to determine whether a Network // satisfies mDefaultRequest. final NetworkCapabilities nc = new NetworkCapabilities(networkCapabilities); + final NetworkScore ns = new NetworkScore(); + ns.putIntExtension(NetworkScore.LEGACY_SCORE, currentScore); final NetworkAgentInfo nai = new NetworkAgentInfo(messenger, new AsyncChannel(), new Network(mNetIdManager.reserveNetId()), new NetworkInfo(networkInfo), lp, nc, - currentScore, mContext, mTrackerHandler, new NetworkMisc(networkMisc), this, mNetd, + ns, mContext, mTrackerHandler, new NetworkMisc(networkMisc), this, mNetd, mDnsResolver, mNMS, factorySerialNumber); // Make sure the network capabilities reflect what the agent info says. nai.setNetworkCapabilities(mixInCapabilities(nai, nc)); @@ -6729,7 +6733,8 @@ public class ConnectivityService extends IConnectivityManager.Stub } } - private void updateNetworkScore(NetworkAgentInfo nai, int score) { + private void updateNetworkScore(NetworkAgentInfo nai, NetworkScore ns) { + int score = ns.getIntExtension(NetworkScore.LEGACY_SCORE); if (VDBG || DDBG) log("updateNetworkScore for " + nai.name() + " to " + score); if (score < 0) { loge("updateNetworkScore for " + nai.name() + " got a negative score (" + score + @@ -6738,7 +6743,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } final int oldScore = nai.getCurrentScore(); - nai.setCurrentScore(score); + nai.setNetworkScore(ns); rematchAllNetworksAndRequests(nai, oldScore); diff --git a/services/core/java/com/android/server/MasterClearReceiver.java b/services/core/java/com/android/server/MasterClearReceiver.java index 06c46b908b7a..6a9246dacc51 100644 --- a/services/core/java/com/android/server/MasterClearReceiver.java +++ b/services/core/java/com/android/server/MasterClearReceiver.java @@ -82,7 +82,7 @@ public class MasterClearReceiver extends BroadcastReceiver { } }; - if (mWipeExternalStorage || mWipeEsims) { + if (mWipeExternalStorage) { // thr will be started at the end of this task. new WipeDataTask(context, thr).execute(); } else { diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index 19ad32e202fe..83ad4e7e7100 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -103,6 +103,8 @@ public class Watchdog extends Thread { public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList( "android.hardware.audio@2.0::IDevicesFactory", "android.hardware.audio@4.0::IDevicesFactory", + "android.hardware.audio@5.0::IDevicesFactory", + "android.hardware.audio@6.0::IDevicesFactory", "android.hardware.biometrics.face@1.0::IBiometricsFace", "android.hardware.bluetooth@1.0::IBluetoothHci", "android.hardware.camera.provider@2.4::ICameraProvider", diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 28c506a8c990..227d0787a879 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -7789,10 +7789,18 @@ public class ActivityManagerService extends IActivityManager.Stub false /* mountExtStorageFull */, abiOverride); } - // TODO: Move to ProcessList? @GuardedBy("this") final ProcessRecord addAppLocked(ApplicationInfo info, String customProcess, boolean isolated, boolean disableHiddenApiChecks, boolean mountExtStorageFull, String abiOverride) { + return addAppLocked(info, customProcess, isolated, disableHiddenApiChecks, + false /* disableTestApiChecks */, mountExtStorageFull, abiOverride); + } + + // TODO: Move to ProcessList? + @GuardedBy("this") + final ProcessRecord addAppLocked(ApplicationInfo info, String customProcess, boolean isolated, + boolean disableHiddenApiChecks, boolean disableTestApiChecks, + boolean mountExtStorageFull, String abiOverride) { ProcessRecord app; if (!isolated) { app = getProcessRecordLocked(customProcess != null ? customProcess : info.processName, @@ -7827,7 +7835,7 @@ public class ActivityManagerService extends IActivityManager.Stub mPersistentStartingProcesses.add(app); mProcessList.startProcessLocked(app, new HostingRecord("added application", customProcess != null ? customProcess : app.processName), - disableHiddenApiChecks, mountExtStorageFull, abiOverride); + disableHiddenApiChecks, disableTestApiChecks, mountExtStorageFull, abiOverride); } return app; @@ -15792,6 +15800,10 @@ public class ActivityManagerService extends IActivityManager.Stub enforceCallingPermission(android.Manifest.permission.DISABLE_HIDDEN_API_CHECKS, "disable hidden API checks"); } + // Allow instrumented processes access to test APIs. + // TODO(satayev): make this configurable via testing framework. + boolean disableTestApiChecks = true; + final boolean mountExtStorageFull = isCallerShell() && (flags & INSTR_FLAG_MOUNT_EXTERNAL_STORAGE_FULL) != 0; @@ -15806,7 +15818,7 @@ public class ActivityManagerService extends IActivityManager.Stub } ProcessRecord app = addAppLocked(ai, defProcess, false, disableHiddenApiChecks, - mountExtStorageFull, abiOverride); + disableTestApiChecks, mountExtStorageFull, abiOverride); app.setActiveInstrumentation(activeInstr); activeInstr.mFinished = false; activeInstr.mRunningProcesses.add(app); diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 3c098d1a6653..1d099c81a1e7 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -1329,7 +1329,7 @@ public final class ProcessList { final int procCount = procs.size(); for (int i = 0; i < procCount; i++) { final int procUid = procs.keyAt(i); - if (UserHandle.isApp(procUid) || !UserHandle.isSameUser(procUid, uid)) { + if (!UserHandle.isCore(procUid) || !UserHandle.isSameUser(procUid, uid)) { // Don't use an app process or different user process for system component. continue; } @@ -1419,15 +1419,11 @@ public final class ProcessList { /** * @return {@code true} if process start is successful, false otherwise. - * @param app - * @param hostingRecord - * @param disableHiddenApiChecks - * @param abiOverride */ @GuardedBy("mService") boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord, - boolean disableHiddenApiChecks, boolean mountExtStorageFull, - String abiOverride) { + boolean disableHiddenApiChecks, boolean disableTestApiChecks, + boolean mountExtStorageFull, String abiOverride) { if (app.pendingStart) { return true; } @@ -1572,6 +1568,10 @@ public final class ProcessList { throw new IllegalStateException("Invalid API policy: " + policy); } runtimeFlags |= policyBits; + + if (disableTestApiChecks) { + runtimeFlags |= Zygote.DISABLE_TEST_API_ENFORCEMENT_POLICY; + } } String useAppImageCache = SystemProperties.get( @@ -1845,7 +1845,8 @@ public final class ProcessList { final boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord, String abiOverride) { return startProcessLocked(app, hostingRecord, - false /* disableHiddenApiChecks */, false /* mountExtStorageFull */, abiOverride); + false /* disableHiddenApiChecks */, false /* disableTestApiChecks */, + false /* mountExtStorageFull */, abiOverride); } @GuardedBy("mService") diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 055a4bde8a78..24569a624a51 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -1582,12 +1582,13 @@ public class AudioService extends IAudioService.Stub setMicrophoneMuteNoCallerCheck(currentUser); } - private int rescaleIndex(int index, int srcStream, int dstStream) { - int srcRange = - mStreamStates[srcStream].getMaxIndex() - mStreamStates[srcStream].getMinIndex(); - int dstRange = - mStreamStates[dstStream].getMaxIndex() - mStreamStates[dstStream].getMinIndex(); + private int getIndexRange(int streamType) { + return (mStreamStates[streamType].getMaxIndex() - mStreamStates[streamType].getMinIndex()); + } + private int rescaleIndex(int index, int srcStream, int dstStream) { + int srcRange = getIndexRange(srcStream); + int dstRange = getIndexRange(dstStream); if (srcRange == 0) { Log.e(TAG, "rescaleIndex : index range should not be zero"); return mStreamStates[dstStream].getMinIndex(); @@ -1598,6 +1599,17 @@ public class AudioService extends IAudioService.Stub / srcRange; } + private int rescaleStep(int step, int srcStream, int dstStream) { + int srcRange = getIndexRange(srcStream); + int dstRange = getIndexRange(dstStream); + if (srcRange == 0) { + Log.e(TAG, "rescaleStep : index range should not be zero"); + return 0; + } + + return ((step * dstRange + srcRange / 2) / srcRange); + } + /////////////////////////////////////////////////////////////////////////// // IPC methods /////////////////////////////////////////////////////////////////////////// @@ -1774,7 +1786,7 @@ public class AudioService extends IAudioService.Stub } } else { // convert one UI step (+/-1) into a number of internal units on the stream alias - step = rescaleIndex(10, streamType, streamTypeAlias); + step = rescaleStep(10, streamType, streamTypeAlias); } // If either the client forces allowing ringer modes for this adjustment, diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java index 96b7cb315f58..24a5b7fa1489 100644 --- a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java +++ b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java @@ -28,6 +28,7 @@ import android.net.NetworkInfo; import android.net.NetworkMisc; import android.net.NetworkMonitorManager; import android.net.NetworkRequest; +import android.net.NetworkScore; import android.net.NetworkState; import android.os.Handler; import android.os.INetworkManagementService; @@ -227,8 +228,10 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { // validated). private boolean mLingering; - // This represents the last score received from the NetworkAgent. - private int currentScore; + // This represents the characteristics of a network that affects how good the network is + // considered for a particular use. + @NonNull + private NetworkScore mNetworkScore; // The list of NetworkRequests being satisfied by this Network. private final SparseArray<NetworkRequest> mNetworkRequests = new SparseArray<>(); @@ -257,8 +260,8 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { private final Handler mHandler; public NetworkAgentInfo(Messenger messenger, AsyncChannel ac, Network net, NetworkInfo info, - LinkProperties lp, NetworkCapabilities nc, int score, Context context, Handler handler, - NetworkMisc misc, ConnectivityService connService, INetd netd, + LinkProperties lp, NetworkCapabilities nc, @NonNull NetworkScore ns, Context context, + Handler handler, NetworkMisc misc, ConnectivityService connService, INetd netd, IDnsResolver dnsResolver, INetworkManagementService nms, int factorySerialNumber) { this.messenger = messenger; asyncChannel = ac; @@ -266,7 +269,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { networkInfo = info; linkProperties = lp; networkCapabilities = nc; - currentScore = score; + mNetworkScore = ns; clatd = new Nat464Xlat(this, netd, dnsResolver, nms); mConnService = connService; mContext = context; @@ -483,7 +486,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { return ConnectivityConstants.EXPLICITLY_SELECTED_NETWORK_SCORE; } - int score = currentScore; + int score = mNetworkScore.getIntExtension(NetworkScore.LEGACY_SCORE); if (!lastValidated && !pretendValidated && !ignoreWifiUnvalidationPenalty() && !isVPN()) { score -= ConnectivityConstants.UNVALIDATED_SCORE_PENALTY; } @@ -512,8 +515,13 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { return getCurrentScore(true); } - public void setCurrentScore(int newScore) { - currentScore = newScore; + public void setNetworkScore(@NonNull NetworkScore ns) { + mNetworkScore = ns; + } + + @NonNull + public NetworkScore getNetworkScore() { + return mNetworkScore; } public NetworkState getNetworkState() { diff --git a/services/core/java/com/android/server/notification/NotificationComparator.java b/services/core/java/com/android/server/notification/NotificationComparator.java index 9b9f4de7a18f..bc051547a53f 100644 --- a/services/core/java/com/android/server/notification/NotificationComparator.java +++ b/services/core/java/com/android/server/notification/NotificationComparator.java @@ -129,6 +129,12 @@ public class NotificationComparator return -1 * Integer.compare(leftPriority, rightPriority); } + final boolean leftInterruptive = left.isInterruptive(); + final boolean rightInterruptive = right.isInterruptive(); + if (leftInterruptive != rightInterruptive) { + return -1 * Boolean.compare(leftInterruptive, rightInterruptive); + } + // then break ties by time, most recent first return -1 * Long.compare(left.getRankingTimeMs(), right.getRankingTimeMs()); } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index a213d482aacd..edccf058caad 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -5542,7 +5542,9 @@ public class NotificationManagerService extends SystemService { notification.flags |= old.getNotification().flags & FLAG_FOREGROUND_SERVICE; r.isUpdate = true; - r.setTextChanged(isVisuallyInterruptive(old, r)); + final boolean isInterruptive = isVisuallyInterruptive(old, r); + r.setTextChanged(isInterruptive); + r.setInterruptive(isInterruptive); } mNotificationsByKey.put(n.getKey(), r); @@ -5641,7 +5643,6 @@ public class NotificationManagerService extends SystemService { Notification oldN = old.sbn.getNotification(); Notification newN = r.sbn.getNotification(); - if (oldN.extras == null || newN.extras == null) { if (DEBUG_INTERRUPTIVENESS) { Slog.v(TAG, "INTERRUPTIVENESS: " @@ -5673,6 +5674,7 @@ public class NotificationManagerService extends SystemService { } return true; } + // Do not compare Spannables (will always return false); compare unstyled Strings final String oldText = String.valueOf(oldN.extras.get(Notification.EXTRA_TEXT)); final String newText = String.valueOf(newN.extras.get(Notification.EXTRA_TEXT)); @@ -5687,6 +5689,7 @@ public class NotificationManagerService extends SystemService { } return true; } + if (oldN.hasCompletedProgress() != newN.hasCompletedProgress()) { if (DEBUG_INTERRUPTIVENESS) { Slog.v(TAG, "INTERRUPTIVENESS: " @@ -5694,6 +5697,16 @@ public class NotificationManagerService extends SystemService { } return true; } + + // Fields below are invisible to bubbles. + if (r.canBubble()) { + if (DEBUG_INTERRUPTIVENESS) { + Slog.v(TAG, "INTERRUPTIVENESS: " + + r.getKey() + " is not interruptive: bubble"); + } + return false; + } + // Actions if (Notification.areActionsVisiblyDifferent(oldN, newN)) { if (DEBUG_INTERRUPTIVENESS) { @@ -5727,7 +5740,6 @@ public class NotificationManagerService extends SystemService { } catch (Exception e) { Slog.w(TAG, "error recovering builder", e); } - return false; } @@ -5922,12 +5934,17 @@ public class NotificationManagerService extends SystemService { Slog.v(TAG, "INTERRUPTIVENESS: " + record.getKey() + " is not interruptive: summary"); } + } else if (record.canBubble()) { + if (DEBUG_INTERRUPTIVENESS) { + Slog.v(TAG, "INTERRUPTIVENESS: " + + record.getKey() + " is not interruptive: bubble"); + } } else { + record.setInterruptive(true); if (DEBUG_INTERRUPTIVENESS) { Slog.v(TAG, "INTERRUPTIVENESS: " + record.getKey() + " is interruptive: alerted"); } - record.setInterruptive(true); } MetricsLogger.action(record.getLogMaker() .setCategory(MetricsEvent.NOTIFICATION_ALERT) @@ -6286,15 +6303,21 @@ public class NotificationManagerService extends SystemService { int indexBefore = findNotificationRecordIndexLocked(record); boolean interceptBefore = record.isIntercepted(); int visibilityBefore = record.getPackageVisibilityOverride(); + boolean interruptiveBefore = record.isInterruptive(); + recon.applyChangesLocked(record); applyZenModeLocked(record); mRankingHelper.sort(mNotificationList); - int indexAfter = findNotificationRecordIndexLocked(record); - boolean interceptAfter = record.isIntercepted(); - int visibilityAfter = record.getPackageVisibilityOverride(); - changed = indexBefore != indexAfter || interceptBefore != interceptAfter - || visibilityBefore != visibilityAfter; - if (interceptBefore && !interceptAfter + boolean indexChanged = indexBefore != findNotificationRecordIndexLocked(record); + boolean interceptChanged = interceptBefore != record.isIntercepted(); + boolean visibilityChanged = visibilityBefore != record.getPackageVisibilityOverride(); + + // Broadcast isInterruptive changes for bubbles. + boolean interruptiveChanged = + record.canBubble() && (interruptiveBefore != record.isInterruptive()); + + changed = indexChanged || interceptChanged || visibilityChanged || interruptiveChanged; + if (interceptBefore && !record.isIntercepted() && record.isNewEnoughForAlerting(System.currentTimeMillis())) { buzzBeepBlinkLocked(record); } @@ -7425,7 +7448,8 @@ public class NotificationManagerService extends SystemService { record.getSound() != null || record.getVibration() != null, record.getSystemGeneratedSmartActions(), record.getSmartReplies(), - record.canBubble() + record.canBubble(), + record.isInterruptive() ); rankings.add(ranking); } @@ -8613,6 +8637,7 @@ public class NotificationManagerService extends SystemService { @VisibleForTesting void resetAssistantUserSet(int userId) { + checkCallerIsSystemOrShell(); mAssistants.setUserSet(userId, false); handleSavePolicyFile(); } @@ -8620,12 +8645,14 @@ public class NotificationManagerService extends SystemService { @VisibleForTesting @Nullable ComponentName getApprovedAssistant(int userId) { + checkCallerIsSystemOrShell(); List<ComponentName> allowedComponents = mAssistants.getAllowedComponents(userId); return CollectionUtils.firstOrNull(allowedComponents); } @VisibleForTesting protected void simulatePackageSuspendBroadcast(boolean suspend, String pkg) { + checkCallerIsSystemOrShell(); // only use for testing: mimic receive broadcast that package is (un)suspended // but does not actually (un)suspend the package final Bundle extras = new Bundle(); @@ -8642,6 +8669,7 @@ public class NotificationManagerService extends SystemService { @VisibleForTesting protected void simulatePackageDistractionBroadcast(int flag, String[] pkgs) { + checkCallerIsSystemOrShell(); // only use for testing: mimic receive broadcast that package is (un)distracting // but does not actually register that info with packagemanager final Bundle extras = new Bundle(); diff --git a/services/core/java/com/android/server/notification/NotificationShellCmd.java b/services/core/java/com/android/server/notification/NotificationShellCmd.java index dd0f420b6df5..c6c98965d668 100644 --- a/services/core/java/com/android/server/notification/NotificationShellCmd.java +++ b/services/core/java/com/android/server/notification/NotificationShellCmd.java @@ -16,6 +16,12 @@ package com.android.server.notification; +import static android.app.NotificationManager.INTERRUPTION_FILTER_ALARMS; +import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL; +import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE; +import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY; +import static android.app.NotificationManager.INTERRUPTION_FILTER_UNKNOWN; + import android.app.ActivityManager; import android.app.INotificationManager; import android.app.Notification; @@ -26,6 +32,7 @@ import android.app.Person; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; @@ -47,8 +54,8 @@ import java.util.Collections; * Implementation of `cmd notification` in NotificationManagerService. */ public class NotificationShellCmd extends ShellCommand { - private static final String USAGE = - "usage: cmd notification SUBCMD [args]\n\n" + private static final String TAG = "NotifShellCmd"; + private static final String USAGE = "usage: cmd notification SUBCMD [args]\n\n" + "SUBCMDs:\n" + " allow_listener COMPONENT [user_id (current user if not specified)]\n" + " disallow_listener COMPONENT [user_id (current user if not specified)]\n" @@ -89,18 +96,19 @@ public class NotificationShellCmd extends ShellCommand { + "an <intentspec> is (broadcast|service|activity) <args>\n" + " <args> are as described in `am start`"; - public static final int NOTIFICATION_ID = 1138; - public static final String NOTIFICATION_PACKAGE = "com.android.shell"; - public static final String CHANNEL_ID = "shellcmd"; + public static final int NOTIFICATION_ID = 2020; + public static final String CHANNEL_ID = "shell_cmd"; public static final String CHANNEL_NAME = "Shell command"; public static final int CHANNEL_IMP = NotificationManager.IMPORTANCE_DEFAULT; private final NotificationManagerService mDirectService; private final INotificationManager mBinderService; + private final PackageManager mPm; public NotificationShellCmd(NotificationManagerService service) { mDirectService = service; mBinderService = service.getBinderService(); + mPm = mDirectService.getContext().getPackageManager(); } @Override @@ -108,9 +116,44 @@ public class NotificationShellCmd extends ShellCommand { if (cmd == null) { return handleDefaultCommands(cmd); } + String callingPackage = null; + final int callingUid = Binder.getCallingUid(); + long identity = Binder.clearCallingIdentity(); + try { + String[] packages = mPm.getPackagesForUid(callingUid); + if (packages != null && packages.length > 0) { + callingPackage = packages[0]; + } + } catch (Exception e) { + Slog.e(TAG, "failed to get caller pkg", e); + } finally { + Binder.restoreCallingIdentity(identity); + } final PrintWriter pw = getOutPrintWriter(); try { switch (cmd.replace('-', '_')) { + case "set_dnd": { + String mode = getNextArgRequired(); + int interruptionFilter = INTERRUPTION_FILTER_UNKNOWN; + switch(mode) { + case "none": + case "on": + interruptionFilter = INTERRUPTION_FILTER_NONE; + break; + case "priority": + interruptionFilter = INTERRUPTION_FILTER_PRIORITY; + break; + case "alarms": + interruptionFilter = INTERRUPTION_FILTER_ALARMS; + break; + case "all": + case "off": + interruptionFilter = INTERRUPTION_FILTER_ALL; + } + final int filter = interruptionFilter; + mBinderService.setInterruptionFilter(callingPackage, filter); + } + break; case "allow_dnd": { String packageName = getNextArgRequired(); int userId = ActivityManager.getCurrentUser(); @@ -226,7 +269,7 @@ public class NotificationShellCmd extends ShellCommand { } case "post": case "notify": - doNotify(pw); + doNotify(pw, callingPackage, callingUid); break; default: return handleDefaultCommands(cmd); @@ -238,27 +281,14 @@ public class NotificationShellCmd extends ShellCommand { return 0; } - void ensureChannel() throws RemoteException { - final int uid = Binder.getCallingUid(); - final int userid = UserHandle.getCallingUserId(); - final long token = Binder.clearCallingIdentity(); - try { - if (mBinderService.getNotificationChannelForPackage(NOTIFICATION_PACKAGE, - uid, CHANNEL_ID, false) == null) { - final NotificationChannel chan = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, - CHANNEL_IMP); - Slog.v(NotificationManagerService.TAG, - "creating shell channel for user " + userid + " uid " + uid + ": " + chan); - mBinderService.createNotificationChannelsForPackage(NOTIFICATION_PACKAGE, uid, - new ParceledListSlice<NotificationChannel>( - Collections.singletonList(chan))); - Slog.v(NotificationManagerService.TAG, "created channel: " - + mBinderService.getNotificationChannelForPackage(NOTIFICATION_PACKAGE, - uid, CHANNEL_ID, false)); - } - } finally { - Binder.restoreCallingIdentity(token); - } + void ensureChannel(String callingPackage, int callingUid) throws RemoteException { + final NotificationChannel channel = + new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, CHANNEL_IMP); + mBinderService.createNotificationChannels(callingPackage, + new ParceledListSlice<>(Collections.singletonList(channel))); + Slog.v(NotificationManagerService.TAG, "created channel: " + + mBinderService.getNotificationChannel(callingPackage, + UserHandle.getUserId(callingUid), callingPackage, CHANNEL_ID)); } Icon parseIcon(Resources res, String encoded) throws IllegalArgumentException { @@ -287,7 +317,8 @@ public class NotificationShellCmd extends ShellCommand { return null; } - private int doNotify(PrintWriter pw) throws RemoteException, URISyntaxException { + private int doNotify(PrintWriter pw, String callingPackage, int callingUid) + throws RemoteException, URISyntaxException { final Context context = mDirectService.getContext(); final Resources res = context.getResources(); final Notification.Builder builder = new Notification.Builder(context, CHANNEL_ID); @@ -481,26 +512,18 @@ public class NotificationShellCmd extends ShellCommand { builder.setSmallIcon(smallIcon); } - ensureChannel(); + ensureChannel(callingPackage, callingUid); final Notification n = builder.build(); pw.println("posting:\n " + n); Slog.v("NotificationManager", "posting: " + n); - final int userId = UserHandle.getCallingUserId(); - final long token = Binder.clearCallingIdentity(); - try { - mBinderService.enqueueNotificationWithTag( - NOTIFICATION_PACKAGE, "android", - tag, NOTIFICATION_ID, - n, userId); - } finally { - Binder.restoreCallingIdentity(token); - } + mBinderService.enqueueNotificationWithTag(callingPackage, callingPackage, tag, + NOTIFICATION_ID, n, UserHandle.getUserId(callingUid)); if (verbose) { NotificationRecord nr = mDirectService.findNotificationLocked( - NOTIFICATION_PACKAGE, tag, NOTIFICATION_ID, userId); + callingPackage, tag, NOTIFICATION_ID, UserHandle.getUserId(callingUid)); for (int tries = 3; tries-- > 0; ) { if (nr != null) break; try { @@ -509,7 +532,7 @@ public class NotificationShellCmd extends ShellCommand { } catch (InterruptedException e) { } nr = mDirectService.findNotificationLocked( - NOTIFICATION_PACKAGE, tag, NOTIFICATION_ID, userId); + callingPackage, tag, NOTIFICATION_ID, UserHandle.getUserId(callingUid)); } if (nr == null) { pw.println("warning: couldn't find notification after enqueueing"); diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index a0c00f8c9b69..fd44cbb46065 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License.s + * limitations under the License. */ package com.android.server.pm; @@ -29,17 +29,17 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; +import android.content.pm.PackageInstaller; import android.content.pm.PackageManager; import android.content.pm.PackageParser; -import android.content.pm.PackageParser.PackageParserException; import android.os.RemoteException; import android.os.ServiceManager; -import android.os.ServiceManager.ServiceNotFoundException; import android.sysprop.ApexProperties; -import android.util.ArrayMap; import android.util.Slog; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.os.BackgroundThread; import com.android.internal.util.IndentingPrintWriter; import java.io.File; @@ -56,117 +56,33 @@ import java.util.stream.Collectors; * ApexManager class handles communications with the apex service to perform operation and queries, * as well as providing caching to avoid unnecessary calls to the service. */ -class ApexManager { - static final String TAG = "ApexManager"; - private final IApexService mApexService; - private final Context mContext; - private final Object mLock = new Object(); - /** - * A map from {@code APEX packageName} to the {@Link PackageInfo} generated from the {@code - * AndroidManifest.xml} - * - * <p>Note that key of this map is {@code packageName} field of the corresponding {@code - * AndroidManifest.xml}. - */ - @GuardedBy("mLock") - private List<PackageInfo> mAllPackagesCache; - /** - * A map from {@code apexName} to the {@Link PackageInfo} generated from the {@code - * AndroidManifest.xml}. - * - * <p>Note that key of this map is {@code apexName} field which corresponds to the {@code name} - * field of {@code apex_manifest.json}. - */ - // TODO(b/132324953): remove. - @GuardedBy("mLock") - private ArrayMap<String, PackageInfo> mApexNameToPackageInfoCache; +abstract class ApexManager { - - ApexManager(Context context) { - mContext = context; - if (!isApexSupported()) { - mApexService = null; - return; - } - try { - mApexService = IApexService.Stub.asInterface( - ServiceManager.getServiceOrThrow("apexservice")); - } catch (ServiceNotFoundException e) { - throw new IllegalStateException("Required service apexservice not available"); - } - } + private static final String TAG = "ApexManager"; static final int MATCH_ACTIVE_PACKAGE = 1 << 0; static final int MATCH_FACTORY_PACKAGE = 1 << 1; - @IntDef( - flag = true, - prefix = { "MATCH_"}, - value = {MATCH_ACTIVE_PACKAGE, MATCH_FACTORY_PACKAGE}) - @Retention(RetentionPolicy.SOURCE) - @interface PackageInfoFlags{} - void systemReady() { - if (!isApexSupported()) return; - mContext.registerReceiver(new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - onBootCompleted(); - mContext.unregisterReceiver(this); - } - }, new IntentFilter(Intent.ACTION_BOOT_COMPLETED)); - } - - private void populateAllPackagesCacheIfNeeded() { - synchronized (mLock) { - if (mAllPackagesCache != null) { - return; - } - mApexNameToPackageInfoCache = new ArrayMap<>(); + /** + * Returns an instance of either {@link ApexManagerImpl} or {@link ApexManagerNoOp} depending + * on whenever this device supports APEX, i.e. {@link ApexProperties#updatable()} evaluates to + * {@code true}. + */ + static ApexManager create(Context systemContext) { + if (ApexProperties.updatable().orElse(false)) { try { - mAllPackagesCache = new ArrayList<>(); - HashSet<String> activePackagesSet = new HashSet<>(); - HashSet<String> factoryPackagesSet = new HashSet<>(); - final ApexInfo[] allPkgs = mApexService.getAllPackages(); - for (ApexInfo ai : allPkgs) { - // If the device is using flattened APEX, don't report any APEX - // packages since they won't be managed or updated by PackageManager. - if ((new File(ai.modulePath)).isDirectory()) { - break; - } - try { - final PackageInfo pkg = PackageParser.generatePackageInfoFromApex( - ai, PackageManager.GET_META_DATA - | PackageManager.GET_SIGNING_CERTIFICATES); - mAllPackagesCache.add(pkg); - if (ai.isActive) { - if (activePackagesSet.contains(pkg.packageName)) { - throw new IllegalStateException( - "Two active packages have the same name: " - + pkg.packageName); - } - activePackagesSet.add(pkg.packageName); - // TODO(b/132324953): remove. - mApexNameToPackageInfoCache.put(ai.moduleName, pkg); - } - if (ai.isFactory) { - if (factoryPackagesSet.contains(pkg.packageName)) { - throw new IllegalStateException( - "Two factory packages have the same name: " - + pkg.packageName); - } - factoryPackagesSet.add(pkg.packageName); - } - } catch (PackageParserException pe) { - throw new IllegalStateException("Unable to parse: " + ai, pe); - } - } - } catch (RemoteException re) { - Slog.e(TAG, "Unable to retrieve packages from apexservice: " + re.toString()); - throw new RuntimeException(re); + return new ApexManagerImpl(systemContext, IApexService.Stub.asInterface( + ServiceManager.getServiceOrThrow("apexservice"))); + } catch (ServiceManager.ServiceNotFoundException e) { + throw new IllegalStateException("Required service apexservice not available"); } + } else { + return new ApexManagerNoOp(); } } + abstract void systemReady(); + /** * Retrieves information about an APEX package. * @@ -179,35 +95,8 @@ class ApexManager { * @return a PackageInfo object with the information about the package, or null if the package * is not found. */ - @Nullable PackageInfo getPackageInfo(String packageName, @PackageInfoFlags int flags) { - if (!isApexSupported()) return null; - populateAllPackagesCacheIfNeeded(); - boolean matchActive = (flags & MATCH_ACTIVE_PACKAGE) != 0; - boolean matchFactory = (flags & MATCH_FACTORY_PACKAGE) != 0; - for (PackageInfo packageInfo: mAllPackagesCache) { - if (!packageInfo.packageName.equals(packageName)) { - continue; - } - if ((!matchActive || isActive(packageInfo)) - && (!matchFactory || isFactory(packageInfo))) { - return packageInfo; - } - } - return null; - } - - /** - * Returns a {@link PackageInfo} for an active APEX package keyed by it's {@code apexName}. - * - * @deprecated this API will soon be deleted, please don't depend on it. - */ - // TODO(b/132324953): delete. - @Deprecated - @Nullable PackageInfo getPackageInfoForApexName(String apexName) { - if (!isApexSupported()) return null; - populateAllPackagesCacheIfNeeded(); - return mApexNameToPackageInfoCache.get(apexName); - } + @Nullable + abstract PackageInfo getPackageInfo(String packageName, @PackageInfoFlags int flags); /** * Retrieves information about all active APEX packages. @@ -215,14 +104,7 @@ class ApexManager { * @return a List of PackageInfo object, each one containing information about a different * active package. */ - List<PackageInfo> getActivePackages() { - if (!isApexSupported()) return Collections.emptyList(); - populateAllPackagesCacheIfNeeded(); - return mAllPackagesCache - .stream() - .filter(item -> isActive(item)) - .collect(Collectors.toList()); - } + abstract List<PackageInfo> getActivePackages(); /** * Retrieves information about all active pre-installed APEX packages. @@ -230,14 +112,7 @@ class ApexManager { * @return a List of PackageInfo object, each one containing information about a different * active pre-installed package. */ - List<PackageInfo> getFactoryPackages() { - if (!isApexSupported()) return Collections.emptyList(); - populateAllPackagesCacheIfNeeded(); - return mAllPackagesCache - .stream() - .filter(item -> isFactory(item)) - .collect(Collectors.toList()); - } + abstract List<PackageInfo> getFactoryPackages(); /** * Retrieves information about all inactive APEX packages. @@ -245,14 +120,7 @@ class ApexManager { * @return a List of PackageInfo object, each one containing information about a different * inactive package. */ - List<PackageInfo> getInactivePackages() { - if (!isApexSupported()) return Collections.emptyList(); - populateAllPackagesCacheIfNeeded(); - return mAllPackagesCache - .stream() - .filter(item -> !isActive(item)) - .collect(Collectors.toList()); - } + abstract List<PackageInfo> getInactivePackages(); /** * Checks if {@code packageName} is an apex package. @@ -260,16 +128,7 @@ class ApexManager { * @param packageName package to check. * @return {@code true} if {@code packageName} is an apex package. */ - boolean isApexPackage(String packageName) { - if (!isApexSupported()) return false; - populateAllPackagesCacheIfNeeded(); - for (PackageInfo packageInfo : mAllPackagesCache) { - if (packageInfo.packageName.equals(packageName)) { - return true; - } - } - return false; - } + abstract boolean isApexPackage(String packageName); /** * Retrieves information about an apexd staged session i.e. the internal state used by apexd to @@ -278,19 +137,8 @@ class ApexManager { * @param sessionId the identifier of the session. * @return an ApexSessionInfo object, or null if the session is not known. */ - @Nullable ApexSessionInfo getStagedSessionInfo(int sessionId) { - if (!isApexSupported()) return null; - try { - ApexSessionInfo apexSessionInfo = mApexService.getStagedSessionInfo(sessionId); - if (apexSessionInfo.isUnknown) { - return null; - } - return apexSessionInfo; - } catch (RemoteException re) { - Slog.e(TAG, "Unable to contact apexservice", re); - throw new RuntimeException(re); - } - } + @Nullable + abstract ApexSessionInfo getStagedSessionInfo(int sessionId); /** * Submit a staged session to apex service. This causes the apex service to perform some initial @@ -302,47 +150,19 @@ class ApexManager { * @param childSessionIds if {@code sessionId} is a multi-package session, this should contain * an array of identifiers of all the child sessions. Otherwise it should * be an empty array. - * @param apexInfoList this is an output parameter, which needs to be initialized by tha caller - * and will be filled with a list of {@link ApexInfo} objects, each of which - * contains metadata about one of the packages being submitted as part of - * the session. - * @return whether the submission of the session was successful. + * @throws PackageManagerException if call to apexd fails */ - boolean submitStagedSession( - int sessionId, @NonNull int[] childSessionIds, @NonNull ApexInfoList apexInfoList) { - if (!isApexSupported()) return false; - try { - mApexService.submitStagedSession(sessionId, childSessionIds, apexInfoList); - return true; - } catch (RemoteException re) { - Slog.e(TAG, "Unable to contact apexservice", re); - throw new RuntimeException(re); - } catch (Exception e) { - Slog.e(TAG, "apexd verification failed", e); - return false; - } - } + abstract ApexInfoList submitStagedSession(int sessionId, @NonNull int[] childSessionIds) + throws PackageManagerException; /** * Mark a staged session previously submitted using {@code submitStagedSession} as ready to be * applied at next reboot. * * @param sessionId the identifier of the {@link PackageInstallerSession} being marked as ready. - * @return true upon success, false if the session is unknown. + * @throws PackageManagerException if call to apexd fails */ - boolean markStagedSessionReady(int sessionId) { - if (!isApexSupported()) return false; - try { - mApexService.markStagedSessionReady(sessionId); - return true; - } catch (RemoteException re) { - Slog.e(TAG, "Unable to contact apexservice", re); - throw new RuntimeException(re); - } catch (Exception e) { - Slog.e(TAG, "Failed to mark session " + sessionId + " ready", e); - return false; - } - } + abstract void markStagedSessionReady(int sessionId) throws PackageManagerException; /** * Marks a staged session as successful. @@ -352,44 +172,21 @@ class ApexManager { * @param sessionId the identifier of the {@link PackageInstallerSession} being marked as * successful. */ - void markStagedSessionSuccessful(int sessionId) { - if (!isApexSupported()) return; - try { - mApexService.markStagedSessionSuccessful(sessionId); - } catch (RemoteException re) { - Slog.e(TAG, "Unable to contact apexservice", re); - throw new RuntimeException(re); - } catch (Exception e) { - // It is fine to just log an exception in this case. APEXd will be able to recover in - // case markStagedSessionSuccessful fails. - Slog.e(TAG, "Failed to mark session " + sessionId + " as successful", e); - } - } + abstract void markStagedSessionSuccessful(int sessionId); /** * Whether the current device supports the management of APEX packages. * * @return true if APEX packages can be managed on this device, false otherwise. */ - boolean isApexSupported() { - return ApexProperties.updatable().orElse(false); - } + abstract boolean isApexSupported(); /** * Abandons the (only) active session previously submitted. * * @return {@code true} upon success, {@code false} if any remote exception occurs */ - boolean abortActiveSession() { - if (!isApexSupported()) return false; - try { - mApexService.abortActiveSession(); - return true; - } catch (RemoteException re) { - Slog.e(TAG, "Unable to contact apexservice", re); - return false; - } - } + abstract boolean abortActiveSession(); /** * Uninstalls given {@code apexPackage}. @@ -399,120 +196,431 @@ class ApexManager { * @param apexPackagePath package to uninstall. * @return {@code true} upon successful uninstall, {@code false} otherwise. */ - boolean uninstallApex(String apexPackagePath) { - if (!isApexSupported()) return false; - try { - mApexService.unstagePackages(Collections.singletonList(apexPackagePath)); - return true; - } catch (Exception e) { - return false; - } - } + abstract boolean uninstallApex(String apexPackagePath); /** - * Whether an APEX package is active or not. + * Dumps various state information to the provided {@link PrintWriter} object. * - * @param packageInfo the package to check - * @return {@code true} if this package is active, {@code false} otherwise. + * @param pw the {@link PrintWriter} object to send information to. + * @param packageName a {@link String} containing a package name, or {@code null}. If set, only + * information about that specific package will be dumped. */ - private static boolean isActive(PackageInfo packageInfo) { - return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) != 0; - } + abstract void dump(PrintWriter pw, @Nullable String packageName); - /** - * Whether the APEX package is pre-installed or not. - * - * @param packageInfo the package to check - * @return {@code true} if this package is pre-installed, {@code false} otherwise. - */ - private static boolean isFactory(PackageInfo packageInfo) { - return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; - } + @IntDef( + flag = true, + prefix = { "MATCH_"}, + value = {MATCH_ACTIVE_PACKAGE, MATCH_FACTORY_PACKAGE}) + @Retention(RetentionPolicy.SOURCE) + @interface PackageInfoFlags{} /** - * Dump information about the packages contained in a particular cache - * @param packagesCache the cache to print information about. - * @param packageName a {@link String} containing a package name, or {@code null}. If set, only - * information about that specific package will be dumped. - * @param ipw the {@link IndentingPrintWriter} object to send information to. + * An implementation of {@link ApexManager} that should be used in case device supports updating + * APEX packages. */ - void dumpFromPackagesCache( - List<PackageInfo> packagesCache, - @Nullable String packageName, - IndentingPrintWriter ipw) { - ipw.println(); - ipw.increaseIndent(); - for (PackageInfo pi : packagesCache) { - if (packageName != null && !packageName.equals(pi.packageName)) { - continue; + @VisibleForTesting + static class ApexManagerImpl extends ApexManager { + private final IApexService mApexService; + private final Context mContext; + private final Object mLock = new Object(); + /** + * A map from {@code APEX packageName} to the {@Link PackageInfo} generated from the {@code + * AndroidManifest.xml} + * + * <p>Note that key of this map is {@code packageName} field of the corresponding {@code + * AndroidManifest.xml}. + */ + @GuardedBy("mLock") + private List<PackageInfo> mAllPackagesCache; + + ApexManagerImpl(Context context, IApexService apexService) { + mContext = context; + mApexService = apexService; + } + + /** + * Whether an APEX package is active or not. + * + * @param packageInfo the package to check + * @return {@code true} if this package is active, {@code false} otherwise. + */ + private static boolean isActive(PackageInfo packageInfo) { + return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) != 0; + } + + /** + * Whether the APEX package is pre-installed or not. + * + * @param packageInfo the package to check + * @return {@code true} if this package is pre-installed, {@code false} otherwise. + */ + private static boolean isFactory(PackageInfo packageInfo) { + return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; + } + + @Override + void systemReady() { + mContext.registerReceiver(new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + // Post populateAllPackagesCacheIfNeeded to a background thread, since it's + // expensive to run it in broadcast handler thread. + BackgroundThread.getHandler().post(() -> populateAllPackagesCacheIfNeeded()); + mContext.unregisterReceiver(this); + } + }, new IntentFilter(Intent.ACTION_BOOT_COMPLETED)); + } + + private void populateAllPackagesCacheIfNeeded() { + synchronized (mLock) { + if (mAllPackagesCache != null) { + return; + } + try { + mAllPackagesCache = new ArrayList<>(); + HashSet<String> activePackagesSet = new HashSet<>(); + HashSet<String> factoryPackagesSet = new HashSet<>(); + final ApexInfo[] allPkgs = mApexService.getAllPackages(); + for (ApexInfo ai : allPkgs) { + // If the device is using flattened APEX, don't report any APEX + // packages since they won't be managed or updated by PackageManager. + if ((new File(ai.modulePath)).isDirectory()) { + break; + } + int flags = PackageManager.GET_META_DATA + | PackageManager.GET_SIGNING_CERTIFICATES + | PackageManager.GET_SIGNATURES; + PackageParser.Package pkg; + try { + File apexFile = new File(ai.modulePath); + PackageParser pp = new PackageParser(); + pkg = pp.parsePackage(apexFile, flags, false); + PackageParser.collectCertificates(pkg, false); + } catch (PackageParser.PackageParserException pe) { + throw new IllegalStateException("Unable to parse: " + ai, pe); + } + + final PackageInfo packageInfo = + PackageParser.generatePackageInfo(pkg, ai, flags); + mAllPackagesCache.add(packageInfo); + if (ai.isActive) { + if (activePackagesSet.contains(packageInfo.packageName)) { + throw new IllegalStateException( + "Two active packages have the same name: " + + packageInfo.packageName); + } + activePackagesSet.add(packageInfo.packageName); + } + if (ai.isFactory) { + if (factoryPackagesSet.contains(packageInfo.packageName)) { + throw new IllegalStateException( + "Two factory packages have the same name: " + + packageInfo.packageName); + } + factoryPackagesSet.add(packageInfo.packageName); + } + + } + } catch (RemoteException re) { + Slog.e(TAG, "Unable to retrieve packages from apexservice: " + re.toString()); + throw new RuntimeException(re); + } } - ipw.println(pi.packageName); - ipw.increaseIndent(); - ipw.println("Version: " + pi.versionCode); - ipw.println("Path: " + pi.applicationInfo.sourceDir); - ipw.println("IsActive: " + isActive(pi)); - ipw.println("IsFactory: " + isFactory(pi)); - ipw.decreaseIndent(); } - ipw.decreaseIndent(); - ipw.println(); - } - /** - * Dumps various state information to the provided {@link PrintWriter} object. - * - * @param pw the {@link PrintWriter} object to send information to. - * @param packageName a {@link String} containing a package name, or {@code null}. If set, only - * information about that specific package will be dumped. - */ - void dump(PrintWriter pw, @Nullable String packageName) { - if (!isApexSupported()) return; - final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ", 120); - try { + @Override + @Nullable PackageInfo getPackageInfo(String packageName, @PackageInfoFlags int flags) { populateAllPackagesCacheIfNeeded(); + boolean matchActive = (flags & MATCH_ACTIVE_PACKAGE) != 0; + boolean matchFactory = (flags & MATCH_FACTORY_PACKAGE) != 0; + for (PackageInfo packageInfo: mAllPackagesCache) { + if (!packageInfo.packageName.equals(packageName)) { + continue; + } + if ((matchActive && isActive(packageInfo)) + || (matchFactory && isFactory(packageInfo))) { + return packageInfo; + } + } + return null; + } + + @Override + List<PackageInfo> getActivePackages() { + populateAllPackagesCacheIfNeeded(); + return mAllPackagesCache + .stream() + .filter(item -> isActive(item)) + .collect(Collectors.toList()); + } + + @Override + List<PackageInfo> getFactoryPackages() { + populateAllPackagesCacheIfNeeded(); + return mAllPackagesCache + .stream() + .filter(item -> isFactory(item)) + .collect(Collectors.toList()); + } + + @Override + List<PackageInfo> getInactivePackages() { + populateAllPackagesCacheIfNeeded(); + return mAllPackagesCache + .stream() + .filter(item -> !isActive(item)) + .collect(Collectors.toList()); + } + + @Override + boolean isApexPackage(String packageName) { + if (!isApexSupported()) return false; + populateAllPackagesCacheIfNeeded(); + for (PackageInfo packageInfo : mAllPackagesCache) { + if (packageInfo.packageName.equals(packageName)) { + return true; + } + } + return false; + } + + @Override + @Nullable ApexSessionInfo getStagedSessionInfo(int sessionId) { + try { + ApexSessionInfo apexSessionInfo = mApexService.getStagedSessionInfo(sessionId); + if (apexSessionInfo.isUnknown) { + return null; + } + return apexSessionInfo; + } catch (RemoteException re) { + Slog.e(TAG, "Unable to contact apexservice", re); + throw new RuntimeException(re); + } + } + + @Override + ApexInfoList submitStagedSession(int sessionId, @NonNull int[] childSessionIds) + throws PackageManagerException { + try { + final ApexInfoList apexInfoList = new ApexInfoList(); + mApexService.submitStagedSession(sessionId, childSessionIds, apexInfoList); + return apexInfoList; + } catch (RemoteException re) { + Slog.e(TAG, "Unable to contact apexservice", re); + throw new RuntimeException(re); + } catch (Exception e) { + throw new PackageManagerException( + PackageInstaller.SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "apexd verification failed : " + e.getMessage()); + } + } + + @Override + void markStagedSessionReady(int sessionId) throws PackageManagerException { + try { + mApexService.markStagedSessionReady(sessionId); + } catch (RemoteException re) { + Slog.e(TAG, "Unable to contact apexservice", re); + throw new RuntimeException(re); + } catch (Exception e) { + throw new PackageManagerException( + PackageInstaller.SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "Failed to mark apexd session as ready : " + e.getMessage()); + } + } + + @Override + void markStagedSessionSuccessful(int sessionId) { + try { + mApexService.markStagedSessionSuccessful(sessionId); + } catch (RemoteException re) { + Slog.e(TAG, "Unable to contact apexservice", re); + throw new RuntimeException(re); + } catch (Exception e) { + // It is fine to just log an exception in this case. APEXd will be able to recover + // in case markStagedSessionSuccessful fails. + Slog.e(TAG, "Failed to mark session " + sessionId + " as successful", e); + } + } + + @Override + boolean isApexSupported() { + return true; + } + + @Override + boolean abortActiveSession() { + try { + mApexService.abortActiveSession(); + return true; + } catch (RemoteException re) { + Slog.e(TAG, "Unable to contact apexservice", re); + return false; + } + } + + @Override + boolean uninstallApex(String apexPackagePath) { + try { + mApexService.unstagePackages(Collections.singletonList(apexPackagePath)); + return true; + } catch (Exception e) { + return false; + } + } + + /** + * Dump information about the packages contained in a particular cache + * @param packagesCache the cache to print information about. + * @param packageName a {@link String} containing a package name, or {@code null}. If set, + * only information about that specific package will be dumped. + * @param ipw the {@link IndentingPrintWriter} object to send information to. + */ + void dumpFromPackagesCache( + List<PackageInfo> packagesCache, + @Nullable String packageName, + IndentingPrintWriter ipw) { ipw.println(); - ipw.println("Active APEX packages:"); - dumpFromPackagesCache(getActivePackages(), packageName, ipw); - ipw.println("Inactive APEX packages:"); - dumpFromPackagesCache(getInactivePackages(), packageName, ipw); - ipw.println("Factory APEX packages:"); - dumpFromPackagesCache(getFactoryPackages(), packageName, ipw); - ipw.increaseIndent(); - ipw.println("APEX session state:"); ipw.increaseIndent(); - final ApexSessionInfo[] sessions = mApexService.getSessions(); - for (ApexSessionInfo si : sessions) { - ipw.println("Session ID: " + si.sessionId); - ipw.increaseIndent(); - if (si.isUnknown) { - ipw.println("State: UNKNOWN"); - } else if (si.isVerified) { - ipw.println("State: VERIFIED"); - } else if (si.isStaged) { - ipw.println("State: STAGED"); - } else if (si.isActivated) { - ipw.println("State: ACTIVATED"); - } else if (si.isActivationFailed) { - ipw.println("State: ACTIVATION FAILED"); - } else if (si.isSuccess) { - ipw.println("State: SUCCESS"); - } else if (si.isRollbackInProgress) { - ipw.println("State: ROLLBACK IN PROGRESS"); - } else if (si.isRolledBack) { - ipw.println("State: ROLLED BACK"); - } else if (si.isRollbackFailed) { - ipw.println("State: ROLLBACK FAILED"); + for (PackageInfo pi : packagesCache) { + if (packageName != null && !packageName.equals(pi.packageName)) { + continue; } + ipw.println(pi.packageName); + ipw.increaseIndent(); + ipw.println("Version: " + pi.versionCode); + ipw.println("Path: " + pi.applicationInfo.sourceDir); + ipw.println("IsActive: " + isActive(pi)); + ipw.println("IsFactory: " + isFactory(pi)); ipw.decreaseIndent(); } ipw.decreaseIndent(); - } catch (RemoteException e) { - ipw.println("Couldn't communicate with apexd."); + ipw.println(); + } + + @Override + void dump(PrintWriter pw, @Nullable String packageName) { + final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ", 120); + try { + populateAllPackagesCacheIfNeeded(); + ipw.println(); + ipw.println("Active APEX packages:"); + dumpFromPackagesCache(getActivePackages(), packageName, ipw); + ipw.println("Inactive APEX packages:"); + dumpFromPackagesCache(getInactivePackages(), packageName, ipw); + ipw.println("Factory APEX packages:"); + dumpFromPackagesCache(getFactoryPackages(), packageName, ipw); + ipw.increaseIndent(); + ipw.println("APEX session state:"); + ipw.increaseIndent(); + final ApexSessionInfo[] sessions = mApexService.getSessions(); + for (ApexSessionInfo si : sessions) { + ipw.println("Session ID: " + si.sessionId); + ipw.increaseIndent(); + if (si.isUnknown) { + ipw.println("State: UNKNOWN"); + } else if (si.isVerified) { + ipw.println("State: VERIFIED"); + } else if (si.isStaged) { + ipw.println("State: STAGED"); + } else if (si.isActivated) { + ipw.println("State: ACTIVATED"); + } else if (si.isActivationFailed) { + ipw.println("State: ACTIVATION FAILED"); + } else if (si.isSuccess) { + ipw.println("State: SUCCESS"); + } else if (si.isRollbackInProgress) { + ipw.println("State: ROLLBACK IN PROGRESS"); + } else if (si.isRolledBack) { + ipw.println("State: ROLLED BACK"); + } else if (si.isRollbackFailed) { + ipw.println("State: ROLLBACK FAILED"); + } + ipw.decreaseIndent(); + } + ipw.decreaseIndent(); + } catch (RemoteException e) { + ipw.println("Couldn't communicate with apexd."); + } } } - public void onBootCompleted() { - if (!isApexSupported()) return; - populateAllPackagesCacheIfNeeded(); + /** + * An implementation of {@link ApexManager} that should be used in case device does not support + * updating APEX packages. + */ + private static final class ApexManagerNoOp extends ApexManager { + + @Override + void systemReady() { + // No-op + } + + @Override + PackageInfo getPackageInfo(String packageName, int flags) { + return null; + } + + @Override + List<PackageInfo> getActivePackages() { + return Collections.emptyList(); + } + + @Override + List<PackageInfo> getFactoryPackages() { + return Collections.emptyList(); + } + + @Override + List<PackageInfo> getInactivePackages() { + return Collections.emptyList(); + } + + @Override + boolean isApexPackage(String packageName) { + return false; + } + + @Override + ApexSessionInfo getStagedSessionInfo(int sessionId) { + throw new UnsupportedOperationException(); + } + + @Override + ApexInfoList submitStagedSession(int sessionId, int[] childSessionIds) + throws PackageManagerException { + throw new PackageManagerException(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, + "Device doesn't support updating APEX"); + } + + @Override + void markStagedSessionReady(int sessionId) { + throw new UnsupportedOperationException(); + } + + @Override + void markStagedSessionSuccessful(int sessionId) { + throw new UnsupportedOperationException(); + } + + @Override + boolean isApexSupported() { + return false; + } + + @Override + boolean abortActiveSession() { + throw new UnsupportedOperationException(); + } + + @Override + boolean uninstallApex(String apexPackagePath) { + throw new UnsupportedOperationException(); + } + + @Override + void dump(PrintWriter pw, String packageName) { + // No-op + } } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 871cefdf3e57..310798650f95 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2490,7 +2490,8 @@ public class PackageManagerService extends IPackageManager.Stub mProtectedPackages = new ProtectedPackages(mContext); - mApexManager = new ApexManager(context); + mApexManager = ApexManager.create(context); + // CHECKSTYLE:OFF IndentationCheck synchronized (mInstallLock) { // writer synchronized (mPackages) { @@ -4278,7 +4279,7 @@ public class PackageManagerService extends IPackageManager.Stub } return generatePackageInfo(ps, flags, userId); } - if (!matchFactoryOnly && (flags & MATCH_APEX) != 0) { + if ((flags & MATCH_APEX) != 0) { return mApexManager.getPackageInfo(packageName, ApexManager.MATCH_ACTIVE_PACKAGE); } } @@ -18637,7 +18638,7 @@ public class PackageManagerService extends IPackageManager.Stub continue; } List<VersionedPackage> libClientPackages = getPackagesUsingSharedLibraryLPr( - libraryInfo, 0, currUserId); + libraryInfo, MATCH_KNOWN_PACKAGES, currUserId); if (!ArrayUtils.isEmpty(libClientPackages)) { Slog.w(TAG, "Not removing package " + pkg.manifestPackageName + " hosting lib " + libraryInfo.getName() + " version " @@ -22982,9 +22983,9 @@ public class PackageManagerService extends IPackageManager.Stub mSettings.writeKernelMappingLPr(ps); } - final UserManager um = mContext.getSystemService(UserManager.class); + final UserManagerService um = sUserManager; UserManagerInternal umInternal = getUserManagerInternal(); - for (UserInfo user : um.getUsers()) { + for (UserInfo user : um.getUsers(false /* excludeDying */)) { final int flags; if (umInternal.isUserUnlockingOrUnlocked(user.id)) { flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE; @@ -23667,8 +23668,9 @@ public class PackageManagerService extends IPackageManager.Stub continue; } final String packageName = ps.pkg.packageName; - // Skip over if system app - if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0) { + // Skip over if system app or static shared library + if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0 + || !TextUtils.isEmpty(ps.pkg.staticSharedLibName)) { continue; } if (DEBUG_CLEAN_APKS) { diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 88d681f973c4..2705455078ff 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -30,6 +30,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageInstaller; import android.content.pm.PackageInstaller.SessionInfo; import android.content.pm.PackageManager; +import android.content.pm.PackageParser; import android.content.pm.PackageParser.PackageParserException; import android.content.pm.PackageParser.SigningDetails; import android.content.pm.PackageParser.SigningDetails.SignatureSchemeVersion; @@ -43,6 +44,7 @@ import android.os.ParcelFileDescriptor; import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; +import android.util.IntArray; import android.util.Slog; import android.util.SparseArray; import android.util.apk.ApkSignatureVerifier; @@ -104,21 +106,22 @@ public class StagingManager { return new ParceledListSlice<>(result); } - private boolean validateApexSignature(String apexPath, String apexModuleName) { + private void validateApexSignature(String apexPath, String packageName) + throws PackageManagerException { final SigningDetails signingDetails; try { signingDetails = ApkSignatureVerifier.verify(apexPath, SignatureSchemeVersion.JAR); } catch (PackageParserException e) { - Slog.e(TAG, "Unable to parse APEX package: " + apexPath, e); - return false; + throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "Failed to parse APEX package " + apexPath, e); } - final PackageInfo packageInfo = mApexManager.getPackageInfoForApexName(apexModuleName); - + final PackageInfo packageInfo = mApexManager.getPackageInfo(packageName, + ApexManager.MATCH_ACTIVE_PACKAGE); if (packageInfo == null) { - // Don't allow installation of new APEX. - Slog.e(TAG, "Attempted to install a new apex " + apexModuleName + ". Rejecting"); - return false; + // This should never happen, because submitSessionToApexService ensures that no new + // apexes were installed. + throw new IllegalStateException("Unknown apex package " + packageName); } final SigningDetails existingSigningDetails; @@ -126,73 +129,99 @@ public class StagingManager { existingSigningDetails = ApkSignatureVerifier.verify( packageInfo.applicationInfo.sourceDir, SignatureSchemeVersion.JAR); } catch (PackageParserException e) { - Slog.e(TAG, "Unable to parse APEX package: " - + packageInfo.applicationInfo.sourceDir, e); - return false; + throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "Failed to parse APEX package " + packageInfo.applicationInfo.sourceDir, e); } // Now that we have both sets of signatures, demand that they're an exact match. if (Signature.areExactMatch(existingSigningDetails.signatures, signingDetails.signatures)) { - return true; + return; } - return false; + throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "APK-container signature verification failed for package " + + packageName + ". Signature of file " + + apexPath + " does not match the signature of " + + " the package already installed."); } - private boolean submitSessionToApexService(@NonNull PackageInstallerSession session, - List<PackageInstallerSession> childSessions, - ApexInfoList apexInfoList) { - boolean submittedToApexd = mApexManager.submitStagedSession( - session.sessionId, - childSessions != null - ? childSessions.stream().mapToInt(s -> s.sessionId).toArray() : - new int[]{}, - apexInfoList); - if (!submittedToApexd) { - session.setStagedSessionFailed( - SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, - "APEX staging failed, check logcat messages from apexd for more details."); - return false; + private List<PackageInfo> submitSessionToApexService( + @NonNull PackageInstallerSession session) throws PackageManagerException { + final IntArray childSessionsIds = new IntArray(); + if (session.isMultiPackage()) { + for (int id : session.getChildSessionIds()) { + if (isApexSession(mStagedSessions.get(id))) { + childSessionsIds.add(id); + } + } } - for (ApexInfo newModule : apexInfoList.apexInfos) { - PackageInfo activePackage = mApexManager.getPackageInfoForApexName( - newModule.moduleName); + // submitStagedSession will throw a PackageManagerException if apexd verification fails, + // which will be propagated to populate stagedSessionErrorMessage of this session. + final ApexInfoList apexInfoList = mApexManager.submitStagedSession(session.sessionId, + childSessionsIds.toArray()); + final List<PackageInfo> result = new ArrayList<>(); + for (ApexInfo apexInfo : apexInfoList.apexInfos) { + final PackageInfo packageInfo; + int flags = PackageManager.GET_META_DATA; + PackageParser.Package pkg; + try { + File apexFile = new File(apexInfo.modulePath); + PackageParser pp = new PackageParser(); + pkg = pp.parsePackage(apexFile, flags, false); + } catch (PackageParserException e) { + throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "Failed to parse APEX package " + apexInfo.modulePath, e); + } + packageInfo = PackageParser.generatePackageInfo(pkg, apexInfo, flags); + final PackageInfo activePackage = mApexManager.getPackageInfo(packageInfo.packageName, + ApexManager.MATCH_ACTIVE_PACKAGE); if (activePackage == null) { - continue; - } - long activeVersion = activePackage.applicationInfo.longVersionCode; - if (session.params.requiredInstalledVersionCode - != PackageManager.VERSION_CODE_HIGHEST) { - if (activeVersion != session.params.requiredInstalledVersionCode) { - session.setStagedSessionFailed( - SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, - "Installed version of APEX package " + activePackage.packageName - + " does not match required. Active version: " + activeVersion - + " required: " + session.params.requiredInstalledVersionCode); - - if (!mApexManager.abortActiveSession()) { - Slog.e(TAG, "Failed to abort apex session " + session.sessionId); - } - return false; - } + Slog.w(TAG, "Attempting to install new APEX package " + packageInfo.packageName); + throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "It is forbidden to install new APEX packages."); } + checkRequiredVersionCode(session, activePackage); + checkDowngrade(session, activePackage, packageInfo); + result.add(packageInfo); + } + return result; + } - boolean allowsDowngrade = PackageManagerServiceUtils.isDowngradePermitted( - session.params.installFlags, activePackage.applicationInfo.flags); - if (activeVersion > newModule.versionCode && !allowsDowngrade) { - session.setStagedSessionFailed( - SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, - "Downgrade of APEX package " + activePackage.packageName - + " is not allowed. Active version: " + activeVersion - + " attempted: " + newModule.versionCode); + private void checkRequiredVersionCode(final PackageInstallerSession session, + final PackageInfo activePackage) throws PackageManagerException { + if (session.params.requiredInstalledVersionCode == PackageManager.VERSION_CODE_HIGHEST) { + return; + } + final long activeVersion = activePackage.applicationInfo.longVersionCode; + if (activeVersion != session.params.requiredInstalledVersionCode) { + if (!mApexManager.abortActiveSession()) { + Slog.e(TAG, "Failed to abort apex session " + session.sessionId); + } + throw new PackageManagerException( + SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "Installed version of APEX package " + activePackage.packageName + + " does not match required. Active version: " + activeVersion + + " required: " + session.params.requiredInstalledVersionCode); + } + } - if (!mApexManager.abortActiveSession()) { - Slog.e(TAG, "Failed to abort apex session " + session.sessionId); - } - return false; + private void checkDowngrade(final PackageInstallerSession session, + final PackageInfo activePackage, final PackageInfo newPackage) + throws PackageManagerException { + final long activeVersion = activePackage.applicationInfo.longVersionCode; + final long newVersionCode = newPackage.applicationInfo.longVersionCode; + boolean allowsDowngrade = PackageManagerServiceUtils.isDowngradePermitted( + session.params.installFlags, activePackage.applicationInfo.flags); + if (activeVersion > newVersionCode && !allowsDowngrade) { + if (!mApexManager.abortActiveSession()) { + Slog.e(TAG, "Failed to abort apex session " + session.sessionId); } + throw new PackageManagerException( + SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "Downgrade of APEX package " + newPackage.packageName + + " is not allowed. Active version: " + activeVersion + + " attempted: " + newVersionCode); } - return true; } private static boolean isApexSession(@NonNull PackageInstallerSession session) { @@ -200,31 +229,20 @@ public class StagingManager { } private void preRebootVerification(@NonNull PackageInstallerSession session) { - boolean success = true; - - final ApexInfoList apexInfoList = new ApexInfoList(); + final boolean hasApex = sessionContainsApex(session); // APEX checks. For single-package sessions, check if they contain an APEX. For // multi-package sessions, find all the child sessions that contain an APEX. - if (!session.isMultiPackage() - && isApexSession(session)) { - success = submitSessionToApexService(session, null, apexInfoList); - - } else if (session.isMultiPackage()) { - List<PackageInstallerSession> childSessions = - Arrays.stream(session.getChildSessionIds()) - // Retrieve cached sessions matching ids. - .mapToObj(i -> mStagedSessions.get(i)) - // Filter only the ones containing APEX. - .filter(childSession -> isApexSession(childSession)) - .collect(Collectors.toList()); - if (!childSessions.isEmpty()) { - success = submitSessionToApexService(session, childSessions, apexInfoList); - } // else this is a staged multi-package session with no APEX files. - } - - if (!success) { - // submitSessionToApexService will populate error. - return; + if (hasApex) { + try { + final List<PackageInfo> apexPackages = submitSessionToApexService(session); + for (PackageInfo apexPackage : apexPackages) { + validateApexSignature(apexPackage.applicationInfo.sourceDir, + apexPackage.packageName); + } + } catch (PackageManagerException e) { + session.setStagedSessionFailed(e.error, e.getMessage()); + return; + } } if (sessionContainsApk(session)) { @@ -237,25 +255,6 @@ public class StagingManager { } } - if (apexInfoList.apexInfos != null && apexInfoList.apexInfos.length > 0) { - // For APEXes, we validate the signature here before we mark the session as ready, - // so we fail the session early if there is a signature mismatch. For APKs, the - // signature verification will be done by the package manager at the point at which - // it applies the staged install. - for (ApexInfo apexModule : apexInfoList.apexInfos) { - if (!validateApexSignature(apexModule.modulePath, - apexModule.moduleName)) { - session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, - "APK-container signature verification failed for package " - + apexModule.moduleName + ". Signature of file " - + apexModule.modulePath + " does not match the signature of " - + " the package already installed."); - // TODO(b/118865310): abort the session on apexd. - return; - } - } - } - if ((session.params.installFlags & PackageManager.INSTALL_ENABLE_ROLLBACK) != 0) { // If rollback is enabled for this session, we call through to the RollbackManager // with the list of sessions it must enable rollback for. Note that notifyStagedSession @@ -273,12 +272,24 @@ public class StagingManager { } } + // Proactively mark session as ready before calling apexd. Although this call order looks + // counter-intuitive, this is the easiest way to ensure that session won't end up in the + // inconsistent state: + // - If device gets rebooted right before call to apexd, then apexd will never activate + // apex files of this staged session. This will result in StagingManager failing the + // session. + // On the other hand, if the order of the calls was inverted (first call apexd, then mark + // session as ready), then if a device gets rebooted right after the call to apexd, only + // apex part of the train will be applied, leaving device in an inconsistent state. session.setStagedSessionReady(); - if (sessionContainsApex(session) - && !mApexManager.markStagedSessionReady(session.sessionId)) { - session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, - "APEX staging failed, check logcat messages from apexd for more " - + "details."); + if (!hasApex) { + // Session doesn't contain apex, nothing to do. + return; + } + try { + mApexManager.markStagedSessionReady(session.sessionId); + } catch (PackageManagerException e) { + session.setStagedSessionFailed(e.error, e.getMessage()); } } diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java index 28c171bdeb98..9347d2194b68 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -32,6 +32,7 @@ import android.app.timezone.IRulesManager; import android.app.timezone.RulesManager; import android.app.timezone.RulesState; import android.content.Context; +import android.icu.util.TimeZone; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.Slog; @@ -45,7 +46,6 @@ import com.android.timezone.distro.StagedDistroOperation; import com.android.timezone.distro.TimeZoneDistro; import com.android.timezone.distro.installer.TimeZoneDistroInstaller; -import libcore.icu.ICU; import libcore.timezone.TimeZoneDataFiles; import libcore.timezone.TimeZoneFinder; import libcore.timezone.TzDataSetVersion; @@ -519,7 +519,7 @@ public final class RulesManagerService extends IRulesManager.Stub { // Report the active rules version (i.e. the rules in use by the current // process). pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): " - + ICU.getTZDataVersion() + "," + + TimeZone.getTZDataVersion() + "," + ZoneInfoDB.getInstance().getVersion() + "," + TimeZoneFinder.getInstance().getIanaVersion()); break; @@ -535,7 +535,7 @@ public final class RulesManagerService extends IRulesManager.Stub { pw.println("RulesManagerService state: " + toString()); pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): " - + ICU.getTZDataVersion() + "," + + TimeZone.getTZDataVersion() + "," + ZoneInfoDB.getInstance().getVersion() + "," + TimeZoneFinder.getInstance().getIanaVersion()); pw.println("Distro state: " + rulesState.toString()); diff --git a/services/core/java/com/android/server/wallpaper/GLHelper.java b/services/core/java/com/android/server/wallpaper/GLHelper.java new file mode 100644 index 000000000000..1d733f53f055 --- /dev/null +++ b/services/core/java/com/android/server/wallpaper/GLHelper.java @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wallpaper; + +import static android.opengl.EGL14.EGL_ALPHA_SIZE; +import static android.opengl.EGL14.EGL_BLUE_SIZE; +import static android.opengl.EGL14.EGL_CONFIG_CAVEAT; +import static android.opengl.EGL14.EGL_CONTEXT_CLIENT_VERSION; +import static android.opengl.EGL14.EGL_DEFAULT_DISPLAY; +import static android.opengl.EGL14.EGL_DEPTH_SIZE; +import static android.opengl.EGL14.EGL_GREEN_SIZE; +import static android.opengl.EGL14.EGL_HEIGHT; +import static android.opengl.EGL14.EGL_NONE; +import static android.opengl.EGL14.EGL_NO_CONTEXT; +import static android.opengl.EGL14.EGL_NO_DISPLAY; +import static android.opengl.EGL14.EGL_NO_SURFACE; +import static android.opengl.EGL14.EGL_OPENGL_ES2_BIT; +import static android.opengl.EGL14.EGL_RED_SIZE; +import static android.opengl.EGL14.EGL_RENDERABLE_TYPE; +import static android.opengl.EGL14.EGL_STENCIL_SIZE; +import static android.opengl.EGL14.EGL_WIDTH; +import static android.opengl.EGL14.eglChooseConfig; +import static android.opengl.EGL14.eglCreateContext; +import static android.opengl.EGL14.eglCreatePbufferSurface; +import static android.opengl.EGL14.eglDestroyContext; +import static android.opengl.EGL14.eglDestroySurface; +import static android.opengl.EGL14.eglGetDisplay; +import static android.opengl.EGL14.eglGetError; +import static android.opengl.EGL14.eglInitialize; +import static android.opengl.EGL14.eglMakeCurrent; +import static android.opengl.EGL14.eglTerminate; +import static android.opengl.GLES20.GL_MAX_TEXTURE_SIZE; +import static android.opengl.GLES20.glGetIntegerv; + +import android.opengl.EGLConfig; +import android.opengl.EGLContext; +import android.opengl.EGLDisplay; +import android.opengl.EGLSurface; +import android.opengl.GLUtils; +import android.os.SystemProperties; +import android.util.Log; + +class GLHelper { + private static final String TAG = GLHelper.class.getSimpleName(); + private static final int sMaxTextureSize; + + static { + int maxTextureSize = SystemProperties.getInt("sys.max_texture_size", 0); + sMaxTextureSize = maxTextureSize > 0 ? maxTextureSize : retrieveTextureSizeFromGL(); + } + + private static int retrieveTextureSizeFromGL() { + try { + String err; + + // Before we can retrieve info from GL, + // we have to create EGLContext, EGLConfig and EGLDisplay first. + // We will fail at querying info from GL once one of above failed. + // When this happens, we will use defValue instead. + EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); + if (eglDisplay == null || eglDisplay == EGL_NO_DISPLAY) { + err = "eglGetDisplay failed: " + GLUtils.getEGLErrorString(eglGetError()); + throw new RuntimeException(err); + } + + if (!eglInitialize(eglDisplay, null, 0 /* majorOffset */, null, 1 /* minorOffset */)) { + err = "eglInitialize failed: " + GLUtils.getEGLErrorString(eglGetError()); + throw new RuntimeException(err); + } + + EGLConfig eglConfig = null; + int[] configsCount = new int[1]; + EGLConfig[] configs = new EGLConfig[1]; + int[] configSpec = new int[] { + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, + EGL_RED_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_BLUE_SIZE, 8, + EGL_ALPHA_SIZE, 0, + EGL_DEPTH_SIZE, 0, + EGL_STENCIL_SIZE, 0, + EGL_CONFIG_CAVEAT, EGL_NONE, + EGL_NONE + }; + + if (!eglChooseConfig(eglDisplay, configSpec, 0 /* attrib_listOffset */, + configs, 0 /* configOffset */, 1 /* config_size */, + configsCount, 0 /* num_configOffset */)) { + err = "eglChooseConfig failed: " + GLUtils.getEGLErrorString(eglGetError()); + throw new RuntimeException(err); + } else if (configsCount[0] > 0) { + eglConfig = configs[0]; + } + + if (eglConfig == null) { + throw new RuntimeException("eglConfig not initialized!"); + } + + int[] attr_list = new int[] {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE}; + EGLContext eglContext = eglCreateContext( + eglDisplay, eglConfig, EGL_NO_CONTEXT, attr_list, 0 /* offset */); + + if (eglContext == null || eglContext == EGL_NO_CONTEXT) { + err = "eglCreateContext failed: " + GLUtils.getEGLErrorString(eglGetError()); + throw new RuntimeException(err); + } + + // We create a push buffer temporarily for querying info from GL. + int[] attrs = {EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE}; + EGLSurface eglSurface = + eglCreatePbufferSurface(eglDisplay, eglConfig, attrs, 0 /* offset */); + eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext); + + // Now, we are ready to query the info from GL. + int[] maxSize = new int[1]; + glGetIntegerv(GL_MAX_TEXTURE_SIZE, maxSize, 0 /* offset */); + + // We have got the info we want, release all egl resources. + eglMakeCurrent(eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + eglDestroySurface(eglDisplay, eglSurface); + eglDestroyContext(eglDisplay, eglContext); + eglTerminate(eglDisplay); + return maxSize[0]; + } catch (RuntimeException e) { + Log.w(TAG, "Retrieve from GL failed", e); + return Integer.MAX_VALUE; + } + } + + static int getMaxTextureSize() { + return sMaxTextureSize; + } +} + diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index ead9acda873e..4e136af0fdc3 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -134,6 +134,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub private static final boolean DEBUG = false; private static final boolean DEBUG_LIVE = true; + // This 100MB limitation is defined in RecordingCanvas. + private static final int MAX_BITMAP_SIZE = 100 * 1024 * 1024; + public static class Lifecycle extends SystemService { private IWallpaperManagerService mService; @@ -572,7 +575,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub // Only generate crop for default display. final DisplayData wpData = getDisplayDataOrCreate(DEFAULT_DISPLAY); - Rect cropHint = new Rect(wallpaper.cropHint); + final Rect cropHint = new Rect(wallpaper.cropHint); + final DisplayInfo displayInfo = new DisplayInfo(); + mDisplayManager.getDisplay(DEFAULT_DISPLAY).getDisplayInfo(displayInfo); if (DEBUG) { Slog.v(TAG, "Generating crop for new wallpaper(s): 0x" @@ -618,12 +623,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } // scale if the crop height winds up not matching the recommended metrics - needScale = (wpData.mHeight != cropHint.height()); + needScale = wpData.mHeight != cropHint.height() + || cropHint.height() > GLHelper.getMaxTextureSize() + || cropHint.width() > GLHelper.getMaxTextureSize(); //make sure screen aspect ratio is preserved if width is scaled under screen size if (needScale) { - final DisplayInfo displayInfo = new DisplayInfo(); - mDisplayManager.getDisplay(DEFAULT_DISPLAY).getDisplayInfo(displayInfo); final float scaleByHeight = (float) wpData.mHeight / (float) cropHint.height(); final int newWidth = (int) (cropHint.width() * scaleByHeight); if (newWidth < displayInfo.logicalWidth) { @@ -644,14 +649,29 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (!needCrop && !needScale) { // Simple case: the nominal crop fits what we want, so we take // the whole thing and just copy the image file directly. - if (DEBUG) { - Slog.v(TAG, "Null crop of new wallpaper; copying"); + + // TODO: It is not accurate to estimate bitmap size without decoding it, + // may be we can try to remove this optimized way in the future, + // that means, we will always go into the 'else' block. + + // This is just a quick estimation, may be smaller than it is. + long estimateSize = options.outWidth * options.outHeight * 4; + + // A bitmap over than MAX_BITMAP_SIZE will make drawBitmap() fail. + // Please see: RecordingCanvas#throwIfCannotDraw. + if (estimateSize < MAX_BITMAP_SIZE) { + success = FileUtils.copyFile(wallpaper.wallpaperFile, wallpaper.cropFile); } - success = FileUtils.copyFile(wallpaper.wallpaperFile, wallpaper.cropFile); + if (!success) { wallpaper.cropFile.delete(); // TODO: fall back to default wallpaper in this case } + + if (DEBUG) { + Slog.v(TAG, "Null crop of new wallpaper, estimate size=" + + estimateSize + ", success=" + success); + } } else { // Fancy case: crop and scale. First, we decode and scale down if appropriate. FileOutputStream f = null; @@ -665,49 +685,78 @@ public class WallpaperManagerService extends IWallpaperManager.Stub // We calculate the largest power-of-two under the actual ratio rather than // just let the decode take care of it because we also want to remap where the // cropHint rectangle lies in the decoded [super]rect. - final BitmapFactory.Options scaler; final int actualScale = cropHint.height() / wpData.mHeight; int scale = 1; - while (2*scale < actualScale) { + while (2 * scale <= actualScale) { scale *= 2; } - if (scale > 1) { - scaler = new BitmapFactory.Options(); - scaler.inSampleSize = scale; + options.inSampleSize = scale; + options.inJustDecodeBounds = false; + + final Rect estimateCrop = new Rect(cropHint); + estimateCrop.scale(1f / options.inSampleSize); + final float hRatio = (float) wpData.mHeight / estimateCrop.height(); + final int destHeight = (int) (estimateCrop.height() * hRatio); + final int destWidth = (int) (estimateCrop.width() * hRatio); + + // We estimated an invalid crop, try to adjust the cropHint to get a valid one. + if (destWidth > GLHelper.getMaxTextureSize()) { + int newHeight = (int) (wpData.mHeight / hRatio); + int newWidth = (int) (wpData.mWidth / hRatio); + if (DEBUG) { - Slog.v(TAG, "Downsampling cropped rect with scale " + scale); + Slog.v(TAG, "Invalid crop dimensions, trying to adjust."); } - } else { - scaler = null; + + estimateCrop.set(cropHint); + estimateCrop.left += (cropHint.width() - newWidth) / 2; + estimateCrop.top += (cropHint.height() - newHeight) / 2; + estimateCrop.right = estimateCrop.left + newWidth; + estimateCrop.bottom = estimateCrop.top + newHeight; + cropHint.set(estimateCrop); + estimateCrop.scale(1f / options.inSampleSize); + } + + // We've got the safe cropHint; now we want to scale it properly to + // the desired rectangle. + // That's a height-biased operation: make it fit the hinted height. + final int safeHeight = (int) (estimateCrop.height() * hRatio); + final int safeWidth = (int) (estimateCrop.width() * hRatio); + + if (DEBUG) { + Slog.v(TAG, "Decode parameters:"); + Slog.v(TAG, " cropHint=" + cropHint + ", estimateCrop=" + estimateCrop); + Slog.v(TAG, " down sampling=" + options.inSampleSize + + ", hRatio=" + hRatio); + Slog.v(TAG, " dest=" + destWidth + "x" + destHeight); + Slog.v(TAG, " safe=" + safeWidth + "x" + safeHeight); + Slog.v(TAG, " maxTextureSize=" + GLHelper.getMaxTextureSize()); } - Bitmap cropped = decoder.decodeRegion(cropHint, scaler); + + Bitmap cropped = decoder.decodeRegion(cropHint, options); decoder.recycle(); if (cropped == null) { Slog.e(TAG, "Could not decode new wallpaper"); } else { - // We've got the extracted crop; now we want to scale it properly to - // the desired rectangle. That's a height-biased operation: make it - // fit the hinted height, and accept whatever width we end up with. - cropHint.offsetTo(0, 0); - cropHint.right /= scale; // adjust by downsampling factor - cropHint.bottom /= scale; - final float heightR = - ((float) wpData.mHeight) / ((float) cropHint.height()); - if (DEBUG) { - Slog.v(TAG, "scale " + heightR + ", extracting " + cropHint); - } - final int destWidth = (int)(cropHint.width() * heightR); + // We are safe to create final crop with safe dimensions now. final Bitmap finalCrop = Bitmap.createScaledBitmap(cropped, - destWidth, wpData.mHeight, true); + safeWidth, safeHeight, true); if (DEBUG) { Slog.v(TAG, "Final extract:"); Slog.v(TAG, " dims: w=" + wpData.mWidth + " h=" + wpData.mHeight); - Slog.v(TAG, " out: w=" + finalCrop.getWidth() + Slog.v(TAG, " out: w=" + finalCrop.getWidth() + " h=" + finalCrop.getHeight()); } + // A bitmap over than MAX_BITMAP_SIZE will make drawBitmap() fail. + // Please see: RecordingCanvas#throwIfCannotDraw. + if (finalCrop.getByteCount() > MAX_BITMAP_SIZE) { + throw new RuntimeException( + "Too large bitmap, limit=" + MAX_BITMAP_SIZE); + } + f = new FileOutputStream(wallpaper.cropFile); bos = new BufferedOutputStream(f, 32*1024); finalCrop.compress(Bitmap.CompressFormat.JPEG, 100, bos); @@ -1998,6 +2047,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (!isWallpaperSupported(callingPackage)) { return; } + + // Make sure both width and height are not larger than max texture size. + width = Math.min(width, GLHelper.getMaxTextureSize()); + height = Math.min(height, GLHelper.getMaxTextureSize()); + synchronized (mLock) { int userId = UserHandle.getCallingUserId(); WallpaperData wallpaper = getWallpaperSafeLocked(userId, FLAG_SYSTEM); diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index d6fbd35b849f..6175d4183020 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -23,7 +23,6 @@ cc_library_static { "com_android_server_AlarmManagerService.cpp", "com_android_server_am_BatteryStatsService.cpp", "com_android_server_connectivity_Vpn.cpp", - "com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp", "com_android_server_ConsumerIrService.cpp", "com_android_server_devicepolicy_CryptoTestHelper.cpp", "com_android_server_HardwarePropertiesManagerService.cpp", @@ -54,6 +53,7 @@ cc_library_static { "com_android_server_am_LowMemDetector.cpp", "onload.cpp", ":lib_networkStatsFactory_native", + ":tethering-jni-srcs", ], include_dirs: [ diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp index 8ddb86b08ea3..372622801aa0 100644 --- a/services/core/jni/com_android_server_VibratorService.cpp +++ b/services/core/jni/com_android_server_VibratorService.cpp @@ -67,7 +67,11 @@ class VibratorShim : public V1_4::IVibrator { Return<bool> supportsAmplitudeControl() override { int32_t cap = 0; if (!mVib->getCapabilities(&cap).isOk()) return false; - return (cap & aidl::IVibrator::CAP_AMPLITUDE_CONTROL) > 0; + if (mUnderExternalControl) { + return (cap & aidl::IVibrator::CAP_EXTERNAL_AMPLITUDE_CONTROL) > 0; + } else { + return (cap & aidl::IVibrator::CAP_AMPLITUDE_CONTROL) > 0; + } } Return<V1_0::Status> setAmplitude(uint8_t amplitude) override { @@ -96,7 +100,11 @@ class VibratorShim : public V1_4::IVibrator { } Return<V1_0::Status> setExternalControl(bool enabled) override { - return toHidlStatus(mVib->setExternalControl(enabled)); + Return<V1_0::Status> status = toHidlStatus(mVib->setExternalControl(enabled)); + if (status.isOk() && status == V1_0::Status::OK) { + mUnderExternalControl = enabled; + } + return status; } Return<void> perform_1_3(V1_3::Effect effect, V1_0::EffectStrength strength, @@ -154,21 +162,30 @@ class VibratorShim : public V1_4::IVibrator { sp<aidl::IVibratorCallback> cb = callback ? new CallbackShim(callback) : nullptr; int timeoutMs = 0; - V1_0::Status status = toHidlStatus( + Return<V1_0::Status> status = toHidlStatus( mVib->perform(static_cast<aidl::Effect>(effect), static_cast<aidl::EffectStrength>(strength), cb, &timeoutMs)); - _hidl_cb(status, timeoutMs); - return android::hardware::Status::ok(); + + if (status.isOk()) { + _hidl_cb(status, timeoutMs); + return android::hardware::Status::ok(); + } else { + return android::hardware::details::StatusOf<V1_0::Status, void>(status); + } } private: sp<aidl::IVibrator> mVib; + bool mUnderExternalControl = false; - V1_0::Status toHidlStatus(const android::binder::Status& status) { + Return<V1_0::Status> toHidlStatus(const android::binder::Status& status) { switch(status.exceptionCode()) { using android::hardware::Status; case Status::EX_NONE: return V1_0::Status::OK; case Status::EX_ILLEGAL_ARGUMENT: return V1_0::Status::BAD_VALUE; case Status::EX_UNSUPPORTED_OPERATION: return V1_0::Status::UNSUPPORTED_OPERATION; + case Status::EX_TRANSACTION_FAILED: { + return Status::fromStatusT(status.transactionError()); + } } return V1_0::Status::UNKNOWN_ERROR; } @@ -247,8 +264,14 @@ class HalWrapper { } ALOGE("Failed to issue command to vibrator HAL. Retrying."); + // Restoring connection to the HAL. - mHal = I::tryGetService(); + sp<aidl::IVibrator> aidlVib = checkVintfService<aidl::IVibrator>(); + if (aidlVib) { + mHal = new VibratorShim(aidlVib); + } else { + mHal = I::tryGetService(); + } } return ret; } diff --git a/services/net/Android.bp b/services/net/Android.bp index e24dec562a46..c56ecd6e19e7 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -29,6 +29,7 @@ filegroup { "java/android/net/ConnectivityModuleConnector.java", "java/android/net/NetworkStackClient.java", "java/android/net/ip/InterfaceController.java", + "java/android/net/netlink/*.java", "java/android/net/util/InterfaceParams.java", "java/android/net/util/NetdService.java", "java/android/net/util/NetworkConstants.java", diff --git a/services/tests/servicestests/res/raw/apex_test.apex b/services/tests/servicestests/res/raw/apex_test.apex Binary files differnew file mode 100644 index 000000000000..19b1c5e2e1c6 --- /dev/null +++ b/services/tests/servicestests/res/raw/apex_test.apex diff --git a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java new file mode 100644 index 000000000000..6bb4202fa759 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java @@ -0,0 +1,298 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertThrows; + +import android.apex.ApexInfo; +import android.apex.ApexSessionInfo; +import android.apex.IApexService; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.os.FileUtils; +import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + +import com.android.frameworks.servicestests.R; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + +@SmallTest +@Presubmit +@RunWith(AndroidJUnit4.class) +public class ApexManagerTest { + private static final String TEST_APEX_PKG = "com.android.apex.test"; + private static final int TEST_SESSION_ID = 99999999; + private static final int[] TEST_CHILD_SESSION_ID = {8888, 7777}; + private ApexManager mApexManager; + private Context mContext; + + private IApexService mApexService = mock(IApexService.class); + + @Before + public void setUp() throws RemoteException { + mContext = InstrumentationRegistry.getInstrumentation().getContext(); + mApexManager = new ApexManager.ApexManagerImpl(mContext, mApexService); + } + + @Test + public void testGetPackageInfo_setFlagsMatchActivePackage() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, false)); + final PackageInfo activePkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_ACTIVE_PACKAGE); + + assertThat(activePkgPi).isNotNull(); + assertThat(activePkgPi.packageName).contains(TEST_APEX_PKG); + + final PackageInfo factoryPkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_FACTORY_PACKAGE); + + assertThat(factoryPkgPi).isNull(); + } + + @Test + public void testGetPackageInfo_setFlagsMatchFactoryPackage() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + PackageInfo factoryPkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_FACTORY_PACKAGE); + + assertThat(factoryPkgPi).isNotNull(); + assertThat(factoryPkgPi.packageName).contains(TEST_APEX_PKG); + + final PackageInfo activePkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_ACTIVE_PACKAGE); + + assertThat(activePkgPi).isNull(); + } + + @Test + public void testGetPackageInfo_setFlagsNone() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getPackageInfo(TEST_APEX_PKG, 0)).isNull(); + } + + @Test + public void testGetActivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, true)); + + assertThat(mApexManager.getActivePackages()).isNotEmpty(); + } + + @Test + public void testGetActivePackages_noneActivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getActivePackages()).isEmpty(); + } + + @Test + public void testGetFactoryPackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getFactoryPackages()).isNotEmpty(); + } + + @Test + public void testGetFactoryPackages_noneFactoryPackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, false)); + + assertThat(mApexManager.getFactoryPackages()).isEmpty(); + } + + @Test + public void testGetInactivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getInactivePackages()).isNotEmpty(); + } + + @Test + public void testGetInactivePackages_noneInactivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, false)); + + assertThat(mApexManager.getInactivePackages()).isEmpty(); + } + + @Test + public void testIsApexPackage() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.isApexPackage(TEST_APEX_PKG)).isTrue(); + } + + @Test + public void testIsApexSupported() { + assertThat(mApexManager.isApexSupported()).isTrue(); + } + + @Test + public void testGetStagedSessionInfo() throws RemoteException { + when(mApexService.getStagedSessionInfo(anyInt())).thenReturn( + getFakeStagedSessionInfo()); + + mApexManager.getStagedSessionInfo(TEST_SESSION_ID); + verify(mApexService, times(1)).getStagedSessionInfo(TEST_SESSION_ID); + } + + @Test + public void testGetStagedSessionInfo_unKnownStagedSessionId() throws RemoteException { + when(mApexService.getStagedSessionInfo(anyInt())).thenReturn( + getFakeUnknownSessionInfo()); + + assertThat(mApexManager.getStagedSessionInfo(TEST_SESSION_ID)).isNull(); + } + + @Test + public void testSubmitStagedSession_throwPackageManagerException() throws RemoteException { + doAnswer(invocation -> { + throw new Exception(); + }).when(mApexService).submitStagedSession(anyInt(), any(), any()); + + assertThrows(PackageManagerException.class, + () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID)); + } + + @Test + public void testSubmitStagedSession_throwRunTimeException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).submitStagedSession(anyInt(), any(), + any()); + + assertThrows(RuntimeException.class, + () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID)); + } + + @Test + public void testMarkStagedSessionReady_throwPackageManagerException() throws RemoteException { + doAnswer(invocation -> { + throw new Exception(); + }).when(mApexService).markStagedSessionReady(anyInt()); + + assertThrows(PackageManagerException.class, + () -> mApexManager.markStagedSessionReady(TEST_SESSION_ID)); + } + + @Test + public void testMarkStagedSessionReady_throwRunTimeException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).markStagedSessionReady(anyInt()); + + assertThrows(RuntimeException.class, + () -> mApexManager.markStagedSessionReady(TEST_SESSION_ID)); + } + + @Test + public void testAbortActiveSession_remoteException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).abortActiveSession(); + + try { + assertThat(mApexManager.abortActiveSession()).isFalse(); + } catch (Exception e) { + throw new AssertionError("ApexManager should not raise Exception"); + } + } + + @Test + public void testMarkStagedSessionSuccessful_throwRemoteException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).markStagedSessionSuccessful(anyInt()); + + assertThrows(RuntimeException.class, + () -> mApexManager.markStagedSessionSuccessful(TEST_SESSION_ID)); + } + + @Test + public void testUninstallApex_throwException_returnFalse() throws RemoteException { + doAnswer(invocation -> { + throw new Exception(); + }).when(mApexService).unstagePackages(any()); + + assertThat(mApexManager.uninstallApex(TEST_APEX_PKG)).isFalse(); + } + + private ApexInfo[] createApexInfo(boolean isActive, boolean isFactory) { + File apexFile = copyRawResourceToFile(TEST_APEX_PKG, R.raw.apex_test); + ApexInfo apexInfo = new ApexInfo(); + apexInfo.isActive = isActive; + apexInfo.isFactory = isFactory; + apexInfo.moduleName = TEST_APEX_PKG; + apexInfo.modulePath = apexFile.getPath(); + apexInfo.versionCode = 191000070; + + return new ApexInfo[]{apexInfo}; + } + + private ApexSessionInfo getFakeStagedSessionInfo() { + ApexSessionInfo stagedSessionInfo = new ApexSessionInfo(); + stagedSessionInfo.sessionId = TEST_SESSION_ID; + stagedSessionInfo.isStaged = true; + + return stagedSessionInfo; + } + + private ApexSessionInfo getFakeUnknownSessionInfo() { + ApexSessionInfo stagedSessionInfo = new ApexSessionInfo(); + stagedSessionInfo.sessionId = TEST_SESSION_ID; + stagedSessionInfo.isUnknown = true; + + return stagedSessionInfo; + } + + /** + * Copies a specified {@code resourceId} to a temp file. Returns a non-null file if the copy + * succeeded + */ + File copyRawResourceToFile(String baseName, int resourceId) { + File outFile; + try { + outFile = File.createTempFile(baseName, ".apex"); + } catch (IOException e) { + throw new AssertionError("CreateTempFile IOException" + e); + } + + try (InputStream is = mContext.getResources().openRawResource(resourceId); + FileOutputStream os = new FileOutputStream(outFile)) { + assertThat(FileUtils.copy(is, os)).isGreaterThan(0L); + } catch (FileNotFoundException e) { + throw new AssertionError("File not found exception " + e); + } catch (IOException e) { + throw new AssertionError("IOException" + e); + } + + return outFile; + } +} diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java index 806c71a7a9b8..6d5b994a63bb 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java @@ -132,6 +132,7 @@ public class UserManagerServiceUserInfoTest { user.profileBadge = 2; user.partial = true; user.guestToRemove = true; + user.preCreated = true; return user; } @@ -147,5 +148,6 @@ public class UserManagerServiceUserInfoTest { assertEquals("profile badge not preseved", one.profileBadge, two.profileBadge); assertEquals("partial not preseved", one.partial, two.partial); assertEquals("guestToRemove not preseved", one.guestToRemove, two.guestToRemove); + assertEquals("preCreated not preseved", one.preCreated, two.preCreated); } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java index e15af3dbecc4..0b4760d89686 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java @@ -68,6 +68,7 @@ public class NotificationComparatorTest extends UiServiceTestCase { private final int uid2 = 1111111; private static final String TEST_CHANNEL_ID = "test_channel_id"; + private NotificationRecord mRecordMinCallNonInterruptive; private NotificationRecord mRecordMinCall; private NotificationRecord mRecordHighCall; private NotificationRecord mRecordDefaultMedia; @@ -105,6 +106,18 @@ public class NotificationComparatorTest extends UiServiceTestCase { smsPkg = Settings.Secure.getString(mContext.getContentResolver(), Settings.Secure.SMS_DEFAULT_APPLICATION); + Notification nonInterruptiveNotif = new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setCategory(Notification.CATEGORY_CALL) + .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true) + .build(); + mRecordMinCallNonInterruptive = new NotificationRecord(mContext, + new StatusBarNotification(callPkg, + callPkg, 1, "mRecordMinCallNonInterruptive", callUid, callUid, + nonInterruptiveNotif, + new UserHandle(userId), "", 2000), getDefaultChannel()); + mRecordMinCallNonInterruptive.setSystemImportance(NotificationManager.IMPORTANCE_MIN); + mRecordMinCallNonInterruptive.setInterruptive(false); + Notification n1 = new Notification.Builder(mContext, TEST_CHANNEL_ID) .setCategory(Notification.CATEGORY_CALL) .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true) @@ -113,6 +126,7 @@ public class NotificationComparatorTest extends UiServiceTestCase { callPkg, 1, "minCall", callUid, callUid, n1, new UserHandle(userId), "", 2000), getDefaultChannel()); mRecordMinCall.setSystemImportance(NotificationManager.IMPORTANCE_MIN); + mRecordMinCall.setInterruptive(true); Notification n2 = new Notification.Builder(mContext, TEST_CHANNEL_ID) .setCategory(Notification.CATEGORY_CALL) @@ -245,6 +259,7 @@ public class NotificationComparatorTest extends UiServiceTestCase { expected.add(mRecordCheater); expected.add(mRecordCheaterColorized); expected.add(mRecordMinCall); + expected.add(mRecordMinCallNonInterruptive); List<NotificationRecord> actual = new ArrayList<>(); actual.addAll(expected); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java index 397d2155beeb..a9fe1a62b558 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java @@ -51,6 +51,8 @@ import android.service.notification.NotificationRankingUpdate; import android.service.notification.SnoozeCriterion; import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.server.UiServiceTestCase; import org.junit.After; @@ -61,8 +63,6 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; -import androidx.test.runner.AndroidJUnit4; - @SmallTest @RunWith(AndroidJUnit4.class) public class NotificationListenerServiceTest extends UiServiceTestCase { @@ -116,6 +116,7 @@ public class NotificationListenerServiceTest extends UiServiceTestCase { assertActionsEqual(getSmartActions(key, i), ranking.getSmartActions()); assertEquals(getSmartReplies(key, i), ranking.getSmartReplies()); assertEquals(canBubble(i), ranking.canBubble()); + assertEquals(visuallyInterruptive(i), ranking.visuallyInterruptive()); } } @@ -182,7 +183,8 @@ public class NotificationListenerServiceTest extends UiServiceTestCase { tweak.isNoisy(), (ArrayList) tweak.getSmartActions(), (ArrayList) tweak.getSmartReplies(), - tweak.canBubble() + tweak.canBubble(), + tweak.visuallyInterruptive() ); assertNotEquals(nru, nru2); } @@ -258,7 +260,8 @@ public class NotificationListenerServiceTest extends UiServiceTestCase { getNoisy(i), getSmartActions(key, i), getSmartReplies(key, i), - canBubble(i) + canBubble(i), + visuallyInterruptive(i) ); rankings[i] = ranking; } @@ -363,6 +366,10 @@ public class NotificationListenerServiceTest extends UiServiceTestCase { return index % 4 == 0; } + private boolean visuallyInterruptive(int index) { + return index % 4 == 0; + } + private void assertActionsEqual( List<Notification.Action> expecteds, List<Notification.Action> actuals) { assertEquals(expecteds.size(), actuals.size()); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationShellCmdTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationShellCmdTest.java index fa90b291eeee..0d44318e4aaa 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationShellCmdTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationShellCmdTest.java @@ -116,8 +116,8 @@ public class NotificationShellCmdTest extends UiServiceTestCase { ArgumentCaptor<Notification> notificationCaptor = ArgumentCaptor.forClass(Notification.class); verify(mMockBinderService).enqueueNotificationWithTag( - eq(NotificationShellCmd.NOTIFICATION_PACKAGE), - eq("android"), + eq(getContext().getPackageName()), + eq(getContext().getPackageName()), eq(aTag), eq(NotificationShellCmd.NOTIFICATION_ID), notificationCaptor.capture(), diff --git a/startop/view_compiler/Android.bp b/startop/view_compiler/Android.bp index c380d291d573..7cc233b2439e 100644 --- a/startop/view_compiler/Android.bp +++ b/startop/view_compiler/Android.bp @@ -16,7 +16,6 @@ cc_defaults { name: "viewcompiler_defaults", - defaults: ["libdexfile_static_defaults"], header_libs: [ "libbase_headers", ], @@ -30,6 +29,7 @@ cc_defaults { "liblog", "libutils", "libziparchive", + "libz", ], cppflags: ["-std=c++17"], target: { diff --git a/startop/view_compiler/dex_builder.cc b/startop/view_compiler/dex_builder.cc index 48b44d0fc99b..50cf5a50d7a8 100644 --- a/startop/view_compiler/dex_builder.cc +++ b/startop/view_compiler/dex_builder.cc @@ -16,8 +16,6 @@ #include "dex_builder.h" -#include "dex/descriptors_names.h" - #include <fstream> #include <memory> @@ -30,8 +28,6 @@ using std::string; using ::dex::kAccPublic; using Op = Instruction::Op; -using Opcode = ::art::Instruction::Code; - const TypeDescriptor TypeDescriptor::Int() { return TypeDescriptor{"I"}; }; const TypeDescriptor TypeDescriptor::Void() { return TypeDescriptor{"V"}; }; @@ -43,20 +39,29 @@ constexpr uint8_t kDexFileMagic[]{0x64, 0x65, 0x78, 0x0a, 0x30, 0x33, 0x38, 0x00 constexpr size_t kMaxEncodedStringLength{5}; // Converts invoke-* to invoke-*/range -constexpr Opcode InvokeToInvokeRange(Opcode opcode) { +constexpr ::dex::Opcode InvokeToInvokeRange(::dex::Opcode opcode) { switch (opcode) { - case ::art::Instruction::INVOKE_VIRTUAL: - return ::art::Instruction::INVOKE_VIRTUAL_RANGE; - case ::art::Instruction::INVOKE_DIRECT: - return ::art::Instruction::INVOKE_DIRECT_RANGE; - case ::art::Instruction::INVOKE_STATIC: - return ::art::Instruction::INVOKE_STATIC_RANGE; - case ::art::Instruction::INVOKE_INTERFACE: - return ::art::Instruction::INVOKE_INTERFACE_RANGE; + case ::dex::Opcode::OP_INVOKE_VIRTUAL: + return ::dex::Opcode::OP_INVOKE_VIRTUAL_RANGE; + case ::dex::Opcode::OP_INVOKE_DIRECT: + return ::dex::Opcode::OP_INVOKE_DIRECT_RANGE; + case ::dex::Opcode::OP_INVOKE_STATIC: + return ::dex::Opcode::OP_INVOKE_STATIC_RANGE; + case ::dex::Opcode::OP_INVOKE_INTERFACE: + return ::dex::Opcode::OP_INVOKE_INTERFACE_RANGE; default: LOG(FATAL) << opcode << " is not a recognized invoke opcode."; - UNREACHABLE(); + __builtin_unreachable(); + } +} + +std::string DotToDescriptor(const char* class_name) { + std::string descriptor(class_name); + std::replace(descriptor.begin(), descriptor.end(), '.', '/'); + if (descriptor.length() > 0 && descriptor[0] != '[') { + descriptor = "L" + descriptor + ";"; } + return descriptor; } } // namespace @@ -178,7 +183,7 @@ void WriteTestDexFile(const string& filename) { } TypeDescriptor TypeDescriptor::FromClassname(const std::string& name) { - return TypeDescriptor{art::DotToDescriptor(name.c_str())}; + return TypeDescriptor{DotToDescriptor(name.c_str())}; } DexBuilder::DexBuilder() : dex_file_{std::make_shared<ir::DexFile>()} { @@ -219,11 +224,11 @@ ir::String* DexBuilder::GetOrAddString(const std::string& string) { ClassBuilder DexBuilder::MakeClass(const std::string& name) { auto* class_def = Alloc<ir::Class>(); - ir::Type* type_def = GetOrAddType(art::DotToDescriptor(name.c_str())); + ir::Type* type_def = GetOrAddType(DotToDescriptor(name.c_str())); type_def->class_def = class_def; class_def->type = type_def; - class_def->super_class = GetOrAddType(art::DotToDescriptor("java.lang.Object")); + class_def->super_class = GetOrAddType(DotToDescriptor("java.lang.Object")); class_def->access_flags = kAccPublic; return ClassBuilder{this, name, class_def}; } @@ -378,26 +383,26 @@ void MethodBuilder::EncodeInstructions() { void MethodBuilder::EncodeInstruction(const Instruction& instruction) { switch (instruction.opcode()) { case Instruction::Op::kReturn: - return EncodeReturn(instruction, ::art::Instruction::RETURN); + return EncodeReturn(instruction, ::dex::Opcode::OP_RETURN); case Instruction::Op::kReturnObject: - return EncodeReturn(instruction, ::art::Instruction::RETURN_OBJECT); + return EncodeReturn(instruction, ::dex::Opcode::OP_RETURN_OBJECT); case Instruction::Op::kMove: case Instruction::Op::kMoveObject: return EncodeMove(instruction); case Instruction::Op::kInvokeVirtual: - return EncodeInvoke(instruction, art::Instruction::INVOKE_VIRTUAL); + return EncodeInvoke(instruction, ::dex::Opcode::OP_INVOKE_VIRTUAL); case Instruction::Op::kInvokeDirect: - return EncodeInvoke(instruction, art::Instruction::INVOKE_DIRECT); + return EncodeInvoke(instruction, ::dex::Opcode::OP_INVOKE_DIRECT); case Instruction::Op::kInvokeStatic: - return EncodeInvoke(instruction, art::Instruction::INVOKE_STATIC); + return EncodeInvoke(instruction, ::dex::Opcode::OP_INVOKE_STATIC); case Instruction::Op::kInvokeInterface: - return EncodeInvoke(instruction, art::Instruction::INVOKE_INTERFACE); + return EncodeInvoke(instruction, ::dex::Opcode::OP_INVOKE_INTERFACE); case Instruction::Op::kBindLabel: return BindLabel(instruction.args()[0]); case Instruction::Op::kBranchEqz: - return EncodeBranch(art::Instruction::IF_EQZ, instruction); + return EncodeBranch(::dex::Opcode::OP_IF_EQZ, instruction); case Instruction::Op::kBranchNEqz: - return EncodeBranch(art::Instruction::IF_NEZ, instruction); + return EncodeBranch(::dex::Opcode::OP_IF_NEZ, instruction); case Instruction::Op::kNew: return EncodeNew(instruction); case Instruction::Op::kCheckCast: @@ -410,10 +415,10 @@ void MethodBuilder::EncodeInstruction(const Instruction& instruction) { } } -void MethodBuilder::EncodeReturn(const Instruction& instruction, ::art::Instruction::Code opcode) { +void MethodBuilder::EncodeReturn(const Instruction& instruction, ::dex::Opcode opcode) { CHECK(!instruction.dest().has_value()); if (instruction.args().size() == 0) { - Encode10x(art::Instruction::RETURN_VOID); + Encode10x(::dex::Opcode::OP_RETURN_VOID); } else { CHECK_EQ(1, instruction.args().size()); size_t source = RegisterValue(instruction.args()[0]); @@ -433,27 +438,27 @@ void MethodBuilder::EncodeMove(const Instruction& instruction) { if (source.is_immediate()) { // TODO: support more registers CHECK_LT(RegisterValue(*instruction.dest()), 16); - Encode11n(art::Instruction::CONST_4, RegisterValue(*instruction.dest()), source.value()); + Encode11n(::dex::Opcode::OP_CONST_4, RegisterValue(*instruction.dest()), source.value()); } else if (source.is_string()) { constexpr size_t kMaxRegisters = 256; CHECK_LT(RegisterValue(*instruction.dest()), kMaxRegisters); CHECK_LT(source.value(), 65536); // make sure we don't need a jumbo string - Encode21c(::art::Instruction::CONST_STRING, RegisterValue(*instruction.dest()), source.value()); + Encode21c(::dex::Opcode::OP_CONST_STRING, RegisterValue(*instruction.dest()), source.value()); } else if (source.is_variable()) { // For the moment, we only use this when we need to reshuffle registers for // an invoke instruction, meaning we are too big for the 4-bit version. // We'll err on the side of caution and always generate the 16-bit form of // the instruction. - Opcode opcode = instruction.opcode() == Instruction::Op::kMove - ? ::art::Instruction::MOVE_16 - : ::art::Instruction::MOVE_OBJECT_16; + auto opcode = instruction.opcode() == Instruction::Op::kMove + ? ::dex::Opcode::OP_MOVE_16 + : ::dex::Opcode::OP_MOVE_OBJECT_16; Encode32x(opcode, RegisterValue(*instruction.dest()), RegisterValue(source)); } else { UNIMPLEMENTED(FATAL); } } -void MethodBuilder::EncodeInvoke(const Instruction& instruction, ::art::Instruction::Code opcode) { +void MethodBuilder::EncodeInvoke(const Instruction& instruction, ::dex::Opcode opcode) { constexpr size_t kMaxArgs = 5; // Currently, we only support up to 5 arguments. @@ -480,8 +485,8 @@ void MethodBuilder::EncodeInvoke(const Instruction& instruction, ::art::Instruct for (size_t i = 0; i < instruction.args().size(); ++i) { Instruction::Op move_op; - if (opcode == ::art::Instruction::INVOKE_VIRTUAL || - opcode == ::art::Instruction::INVOKE_DIRECT) { + if (opcode == ::dex::Opcode::OP_INVOKE_VIRTUAL || + opcode == ::dex::Opcode::OP_INVOKE_DIRECT) { // In this case, there is an implicit `this` argument, which is always an object. if (i == 0) { move_op = Instruction::Op::kMoveObject; @@ -514,8 +519,8 @@ void MethodBuilder::EncodeInvoke(const Instruction& instruction, ::art::Instruct // If there is a return value, add a move-result instruction if (instruction.dest().has_value()) { - Encode11x(instruction.result_is_object() ? art::Instruction::MOVE_RESULT_OBJECT - : art::Instruction::MOVE_RESULT, + Encode11x(instruction.result_is_object() ? ::dex::Opcode::OP_MOVE_RESULT_OBJECT + : ::dex::Opcode::OP_MOVE_RESULT, RegisterValue(*instruction.dest())); } @@ -523,7 +528,7 @@ void MethodBuilder::EncodeInvoke(const Instruction& instruction, ::art::Instruct } // Encodes a conditional branch that tests a single argument. -void MethodBuilder::EncodeBranch(art::Instruction::Code op, const Instruction& instruction) { +void MethodBuilder::EncodeBranch(::dex::Opcode op, const Instruction& instruction) { const auto& args = instruction.args(); const auto& test_value = args[0]; const auto& branch_target = args[1]; @@ -546,7 +551,7 @@ void MethodBuilder::EncodeNew(const Instruction& instruction) { const Value& type = instruction.args()[0]; CHECK_LT(RegisterValue(*instruction.dest()), 256); CHECK(type.is_type()); - Encode21c(::art::Instruction::NEW_INSTANCE, RegisterValue(*instruction.dest()), type.value()); + Encode21c(::dex::Opcode::OP_NEW_INSTANCE, RegisterValue(*instruction.dest()), type.value()); } void MethodBuilder::EncodeCast(const Instruction& instruction) { @@ -558,7 +563,7 @@ void MethodBuilder::EncodeCast(const Instruction& instruction) { const Value& type = instruction.args()[0]; CHECK_LT(RegisterValue(*instruction.dest()), 256); CHECK(type.is_type()); - Encode21c(::art::Instruction::CHECK_CAST, RegisterValue(*instruction.dest()), type.value()); + Encode21c(::dex::Opcode::OP_CHECK_CAST, RegisterValue(*instruction.dest()), type.value()); } void MethodBuilder::EncodeFieldOp(const Instruction& instruction) { @@ -569,7 +574,7 @@ void MethodBuilder::EncodeFieldOp(const Instruction& instruction) { CHECK(instruction.dest()->is_variable()); CHECK_EQ(0, instruction.args().size()); - Encode21c(::art::Instruction::SGET, + Encode21c(::dex::Opcode::OP_SGET, RegisterValue(*instruction.dest()), instruction.index_argument()); break; @@ -579,7 +584,7 @@ void MethodBuilder::EncodeFieldOp(const Instruction& instruction) { CHECK_EQ(1, args.size()); CHECK(args[0].is_variable()); - Encode21c(::art::Instruction::SPUT, RegisterValue(args[0]), instruction.index_argument()); + Encode21c(::dex::Opcode::OP_SPUT, RegisterValue(args[0]), instruction.index_argument()); break; } case Instruction::Op::kGetInstanceField: { @@ -587,7 +592,7 @@ void MethodBuilder::EncodeFieldOp(const Instruction& instruction) { CHECK(instruction.dest()->is_variable()); CHECK_EQ(1, instruction.args().size()); - Encode22c(::art::Instruction::IGET, + Encode22c(::dex::Opcode::OP_IGET, RegisterValue(*instruction.dest()), RegisterValue(args[0]), instruction.index_argument()); @@ -599,7 +604,7 @@ void MethodBuilder::EncodeFieldOp(const Instruction& instruction) { CHECK(args[0].is_variable()); CHECK(args[1].is_variable()); - Encode22c(::art::Instruction::IPUT, + Encode22c(::dex::Opcode::OP_IPUT, RegisterValue(args[1]), RegisterValue(args[0]), instruction.index_argument()); diff --git a/startop/view_compiler/dex_builder.h b/startop/view_compiler/dex_builder.h index 3924e77fab59..eb2dc88835d4 100644 --- a/startop/view_compiler/dex_builder.h +++ b/startop/view_compiler/dex_builder.h @@ -24,7 +24,9 @@ #include <unordered_map> #include <vector> -#include "dex/dex_instruction.h" +#include "android-base/logging.h" + +#include "slicer/dex_bytecode.h" #include "slicer/dex_ir.h" #include "slicer/writer.h" @@ -364,11 +366,11 @@ class MethodBuilder { // Encodes a return instruction. For instructions with no return value, the opcode field is // ignored. Otherwise, this specifies which return instruction will be used (return, // return-object, etc.) - void EncodeReturn(const Instruction& instruction, ::art::Instruction::Code opcode); + void EncodeReturn(const Instruction& instruction, ::dex::Opcode opcode); void EncodeMove(const Instruction& instruction); - void EncodeInvoke(const Instruction& instruction, ::art::Instruction::Code opcode); - void EncodeBranch(art::Instruction::Code op, const Instruction& instruction); + void EncodeInvoke(const Instruction& instruction, ::dex::Opcode opcode); + void EncodeBranch(::dex::Opcode op, const Instruction& instruction); void EncodeNew(const Instruction& instruction); void EncodeCast(const Instruction& instruction); void EncodeFieldOp(const Instruction& instruction); @@ -377,17 +379,23 @@ class MethodBuilder { // https://source.android.com/devices/tech/dalvik/instruction-formats for documentation of // formats. - inline void Encode10x(art::Instruction::Code opcode) { + inline uint8_t ToBits(::dex::Opcode opcode) { + static_assert(sizeof(uint8_t) == sizeof(::dex::Opcode)); + return static_cast<uint8_t>(opcode); + } + + inline void Encode10x(::dex::Opcode opcode) { // 00|op - buffer_.push_back(opcode); + static_assert(sizeof(uint8_t) == sizeof(::dex::Opcode)); + buffer_.push_back(ToBits(opcode)); } - inline void Encode11x(art::Instruction::Code opcode, uint8_t a) { + inline void Encode11x(::dex::Opcode opcode, uint8_t a) { // aa|op - buffer_.push_back((a << 8) | opcode); + buffer_.push_back((a << 8) | ToBits(opcode)); } - inline void Encode11n(art::Instruction::Code opcode, uint8_t a, int8_t b) { + inline void Encode11n(::dex::Opcode opcode, uint8_t a, int8_t b) { // b|a|op // Make sure the fields are in bounds (4 bits for a, 4 bits for b). @@ -395,30 +403,30 @@ class MethodBuilder { CHECK_LE(-8, b); CHECK_LT(b, 8); - buffer_.push_back(((b & 0xf) << 12) | (a << 8) | opcode); + buffer_.push_back(((b & 0xf) << 12) | (a << 8) | ToBits(opcode)); } - inline void Encode21c(art::Instruction::Code opcode, uint8_t a, uint16_t b) { + inline void Encode21c(::dex::Opcode opcode, uint8_t a, uint16_t b) { // aa|op|bbbb - buffer_.push_back((a << 8) | opcode); + buffer_.push_back((a << 8) | ToBits(opcode)); buffer_.push_back(b); } - inline void Encode22c(art::Instruction::Code opcode, uint8_t a, uint8_t b, uint16_t c) { + inline void Encode22c(::dex::Opcode opcode, uint8_t a, uint8_t b, uint16_t c) { // b|a|op|bbbb CHECK(IsShortRegister(a)); CHECK(IsShortRegister(b)); - buffer_.push_back((b << 12) | (a << 8) | opcode); + buffer_.push_back((b << 12) | (a << 8) | ToBits(opcode)); buffer_.push_back(c); } - inline void Encode32x(art::Instruction::Code opcode, uint16_t a, uint16_t b) { - buffer_.push_back(opcode); + inline void Encode32x(::dex::Opcode opcode, uint16_t a, uint16_t b) { + buffer_.push_back(ToBits(opcode)); buffer_.push_back(a); buffer_.push_back(b); } - inline void Encode35c(art::Instruction::Code opcode, size_t a, uint16_t b, uint8_t c, uint8_t d, + inline void Encode35c(::dex::Opcode opcode, size_t a, uint16_t b, uint8_t c, uint8_t d, uint8_t e, uint8_t f, uint8_t g) { // a|g|op|bbbb|f|e|d|c @@ -428,14 +436,14 @@ class MethodBuilder { CHECK(IsShortRegister(e)); CHECK(IsShortRegister(f)); CHECK(IsShortRegister(g)); - buffer_.push_back((a << 12) | (g << 8) | opcode); + buffer_.push_back((a << 12) | (g << 8) | ToBits(opcode)); buffer_.push_back(b); buffer_.push_back((f << 12) | (e << 8) | (d << 4) | c); } - inline void Encode3rc(art::Instruction::Code opcode, size_t a, uint16_t b, uint16_t c) { + inline void Encode3rc(::dex::Opcode opcode, size_t a, uint16_t b, uint16_t c) { CHECK_LE(a, 255); - buffer_.push_back((a << 8) | opcode); + buffer_.push_back((a << 8) | ToBits(opcode)); buffer_.push_back(b); buffer_.push_back(c); } diff --git a/telephony/java/android/telephony/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java index f87ac503bbc5..a5d25e2ce4bb 100644 --- a/telephony/java/android/telephony/CallerInfo.java +++ b/telecomm/java/android/telecom/CallerInfo.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package android.telephony; +package android.telecom; import android.annotation.Nullable; -import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.ContentResolver; @@ -33,8 +32,10 @@ import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.PhoneLookup; import android.provider.ContactsContract.RawContacts; +import android.telephony.PhoneNumberUtils; +import android.telephony.SubscriptionManager; +import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Log; import com.android.i18n.phonenumbers.NumberParseException; import com.android.i18n.phonenumbers.PhoneNumberUtil; @@ -50,10 +51,9 @@ import java.util.Locale; * * {@hide} */ -@SystemApi public class CallerInfo { private static final String TAG = "CallerInfo"; - private static final boolean VDBG = Rlog.isLoggable(TAG, Log.VERBOSE); + private static final boolean VDBG = Log.VERBOSE; /** @hide */ public static final long USER_TYPE_CURRENT = 0; @@ -215,7 +215,7 @@ public class CallerInfo { info.contactExists = false; info.userType = USER_TYPE_CURRENT; - if (VDBG) Rlog.v(TAG, "getCallerInfo() based on cursor..."); + if (VDBG) Log.v(TAG, "getCallerInfo() based on cursor..."); if (cursor != null) { if (cursor.moveToFirst()) { @@ -263,7 +263,7 @@ public class CallerInfo { if (contactId != 0 && !Contacts.isEnterpriseContactId(contactId)) { info.contactIdOrZero = contactId; if (VDBG) { - Rlog.v(TAG, "==> got info.contactIdOrZero: " + info.contactIdOrZero); + Log.v(TAG, "==> got info.contactIdOrZero: " + info.contactIdOrZero); } } if (Contacts.isEnterpriseContactId(contactId)) { @@ -271,7 +271,7 @@ public class CallerInfo { } } else { // No valid columnIndex, so we can't look up person_id. - Rlog.w(TAG, "Couldn't find contact_id column for " + contactRef); + Log.w(TAG, "Couldn't find contact_id column for " + contactRef); // Watch out: this means that anything that depends on // person_id will be broken (like contact photo lookups in // the in-call UI, for example.) @@ -356,7 +356,7 @@ public class CallerInfo { info = getCallerInfo(context, contactRef, cr.query(contactRef, null, null, null, null)); } catch (RuntimeException re) { - Rlog.e(TAG, "Error getting caller info.", re); + Log.e(TAG, re, "Error getting caller info."); } } return info; @@ -376,7 +376,7 @@ public class CallerInfo { */ @UnsupportedAppUsage public static CallerInfo getCallerInfo(Context context, String number) { - if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number..."); + if (VDBG) Log.v(TAG, "getCallerInfo() based on number..."); int subId = SubscriptionManager.getDefaultSubscriptionId(); return getCallerInfo(context, number, subId); @@ -407,8 +407,8 @@ public class CallerInfo { // shortcut and skip the query. if (PhoneNumberUtils.isLocalEmergencyNumber(context, number)) { return new CallerInfo().markAsEmergency(context); - } else if (PhoneNumberUtils.isVoiceMailNumber(subId, number)) { - return new CallerInfo().markAsVoiceMail(); + } else if (PhoneNumberUtils.isVoiceMailNumber(null, subId, number)) { + return new CallerInfo().markAsVoiceMail(context, subId); } Uri contactUri = Uri.withAppendedPath(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, @@ -542,36 +542,20 @@ public class CallerInfo { } - /** - * Mark this CallerInfo as a voicemail call. The voicemail label - * is obtained from the telephony manager. Caller must hold the - * READ_PHONE_STATE permission otherwise the phoneNumber will be - * set to null. - * @return this instance. - */ - // TODO: As in the emergency number handling, we end up writing a - // string in the phone number field. - /* package */ CallerInfo markAsVoiceMail() { - - int subId = SubscriptionManager.getDefaultSubscriptionId(); - return markAsVoiceMail(subId); - - } - - /* package */ CallerInfo markAsVoiceMail(int subId) { + /* package */ CallerInfo markAsVoiceMail(Context context, int subId) { mIsVoiceMail = true; try { - String voiceMailLabel = TelephonyManager.getDefault().getVoiceMailAlphaTag(subId); - - phoneNumber = voiceMailLabel; + phoneNumber = context.getSystemService(TelephonyManager.class) + .createForSubscriptionId(subId) + .getVoiceMailAlphaTag(); } catch (SecurityException se) { // Should never happen: if this process does not have // permission to retrieve VM tag, it should not have // permission to retrieve VM number and would not call // this method. // Leave phoneNumber untouched. - Rlog.e(TAG, "Cannot access VoiceMail.", se); + Log.e(TAG, se, "Cannot access VoiceMail."); } // TODO: There is no voicemail picture? // FIXME: FIND ANOTHER ICON @@ -630,10 +614,10 @@ public class CallerInfo { // So instead, figure out the column to use for person_id by just // looking at the URI itself. - if (VDBG) Rlog.v(TAG, "- getColumnIndexForPersonId: contactRef URI = '" + if (VDBG) Log.v(TAG, "- getColumnIndexForPersonId: contactRef URI = '" + contactRef + "'..."); // Warning: Do not enable the following logging (due to ANR risk.) - // if (VDBG) Rlog.v(TAG, "- MIME type: " + // if (VDBG) Log.v(TAG, "- MIME type: " // + context.getContentResolver().getType(contactRef)); String url = contactRef.toString(); @@ -641,25 +625,25 @@ public class CallerInfo { if (url.startsWith("content://com.android.contacts/data/phones")) { // Direct lookup in the Phone table. // MIME type: Phone.CONTENT_ITEM_TYPE (= "vnd.android.cursor.item/phone_v2") - if (VDBG) Rlog.v(TAG, "'data/phones' URI; using RawContacts.CONTACT_ID"); + if (VDBG) Log.v(TAG, "'data/phones' URI; using RawContacts.CONTACT_ID"); columnName = RawContacts.CONTACT_ID; } else if (url.startsWith("content://com.android.contacts/data")) { // Direct lookup in the Data table. // MIME type: Data.CONTENT_TYPE (= "vnd.android.cursor.dir/data") - if (VDBG) Rlog.v(TAG, "'data' URI; using Data.CONTACT_ID"); + if (VDBG) Log.v(TAG, "'data' URI; using Data.CONTACT_ID"); // (Note Data.CONTACT_ID and RawContacts.CONTACT_ID are equivalent.) columnName = Data.CONTACT_ID; } else if (url.startsWith("content://com.android.contacts/phone_lookup")) { // Lookup in the PhoneLookup table, which provides "fuzzy matching" // for phone numbers. // MIME type: PhoneLookup.CONTENT_TYPE (= "vnd.android.cursor.dir/phone_lookup") - if (VDBG) Rlog.v(TAG, "'phone_lookup' URI; using PhoneLookup._ID"); + if (VDBG) Log.v(TAG, "'phone_lookup' URI; using PhoneLookup._ID"); columnName = PhoneLookup._ID; } else { - Rlog.w(TAG, "Unexpected prefix for contactRef '" + url + "'"); + Log.w(TAG, "Unexpected prefix for contactRef '" + url + "'"); } int columnIndex = (columnName != null) ? cursor.getColumnIndex(columnName) : -1; - if (VDBG) Rlog.v(TAG, "==> Using column '" + columnName + if (VDBG) Log.v(TAG, "==> Using column '" + columnName + "' (columnIndex = " + columnIndex + ") for person_id lookup..."); return columnIndex; } @@ -689,7 +673,7 @@ public class CallerInfo { * @hide */ public static String getGeoDescription(Context context, String number) { - if (VDBG) Rlog.v(TAG, "getGeoDescription('" + number + "')..."); + if (VDBG) Log.v(TAG, "getGeoDescription('" + number + "')..."); if (TextUtils.isEmpty(number)) { return null; @@ -702,18 +686,18 @@ public class CallerInfo { String countryIso = getCurrentCountryIso(context, locale); PhoneNumber pn = null; try { - if (VDBG) Rlog.v(TAG, "parsing '" + number + if (VDBG) Log.v(TAG, "parsing '" + number + "' for countryIso '" + countryIso + "'..."); pn = util.parse(number, countryIso); - if (VDBG) Rlog.v(TAG, "- parsed number: " + pn); + if (VDBG) Log.v(TAG, "- parsed number: " + pn); } catch (NumberParseException e) { - Rlog.w(TAG, "getGeoDescription: NumberParseException for incoming number '" - + Rlog.pii(TAG, number) + "'"); + Log.w(TAG, "getGeoDescription: NumberParseException for incoming number '" + + Log.pii(number) + "'"); } if (pn != null) { String description = geocoder.getDescriptionForNumber(pn, locale); - if (VDBG) Rlog.v(TAG, "- got description: '" + description + "'"); + if (VDBG) Log.v(TAG, "- got description: '" + description + "'"); return description; } else { return null; @@ -733,12 +717,12 @@ public class CallerInfo { if (country != null) { countryIso = country.getCountryIso(); } else { - Rlog.e(TAG, "CountryDetector.detectCountry() returned null."); + Log.e(TAG, new Exception(), "CountryDetector.detectCountry() returned null."); } } if (countryIso == null) { countryIso = locale.getCountry(); - Rlog.w(TAG, "No CountryDetector; falling back to countryIso based on locale: " + Log.w(TAG, "No CountryDetector; falling back to countryIso based on locale: " + countryIso); } return countryIso; diff --git a/telephony/java/android/telephony/CallerInfoAsyncQuery.java b/telecomm/java/android/telecom/CallerInfoAsyncQuery.java index 87a637668d44..f38b34e85d89 100644 --- a/telephony/java/android/telephony/CallerInfoAsyncQuery.java +++ b/telecomm/java/android/telecom/CallerInfoAsyncQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.telephony; +package android.telecom; import android.app.ActivityManager; import android.content.AsyncQueryHandler; @@ -31,6 +31,8 @@ import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; import android.provider.ContactsContract.PhoneLookup; +import android.telephony.PhoneNumberUtils; +import android.telephony.SubscriptionManager; import android.text.TextUtils; import java.util.ArrayList; import java.util.List; @@ -100,12 +102,12 @@ public class CallerInfoAsyncQuery { */ static ContentResolver getCurrentProfileContentResolver(Context context) { - if (DBG) Rlog.d(LOG_TAG, "Trying to get current content resolver..."); + if (DBG) Log.d(LOG_TAG, "Trying to get current content resolver..."); final int currentUser = ActivityManager.getCurrentUser(); final int myUser = UserManager.get(context).getUserHandle(); - if (DBG) Rlog.d(LOG_TAG, "myUser=" + myUser + "currentUser=" + currentUser); + if (DBG) Log.d(LOG_TAG, "myUser=" + myUser + "currentUser=" + currentUser); if (myUser != currentUser) { final Context otherContext; @@ -114,7 +116,7 @@ public class CallerInfoAsyncQuery { /* flags =*/ 0, UserHandle.of(currentUser)); return otherContext.getContentResolver(); } catch (NameNotFoundException e) { - Rlog.e(LOG_TAG, "Can't find self package", e); + Log.e(LOG_TAG, e, "Can't find self package"); // Fall back to the primary user. } } @@ -179,13 +181,13 @@ public class CallerInfoAsyncQuery { // However, if there is any code that this Handler calls (such as in // super.handleMessage) that DOES place unexpected messages on the // queue, then we need pass these messages on. - Rlog.i(LOG_TAG, "Unexpected command (CookieWrapper is null): " + msg.what + + Log.i(LOG_TAG, "Unexpected command (CookieWrapper is null): " + msg.what + " ignored by CallerInfoWorkerHandler, passing onto parent."); super.handleMessage(msg); } else { - Rlog.d(LOG_TAG, "Processing event: " + cw.event + " token (arg1): " + msg.arg1 + + Log.d(LOG_TAG, "Processing event: " + cw.event + " token (arg1): " + msg.arg1 + " command: " + msg.what + " query URI: " + sanitizeUriToString(args.uri)); switch (cw.event) { @@ -226,7 +228,7 @@ public class CallerInfoAsyncQuery { cw.geoDescription = CallerInfo.getGeoDescription(mContext, cw.number); final long duration = SystemClock.elapsedRealtime() - startTimeMillis; if (duration > 500) { - if (DBG) Rlog.d(LOG_TAG, "[handleGeoDescription]" + + if (DBG) Log.d(LOG_TAG, "[handleGeoDescription]" + "Spends long time to retrieve Geo description: " + duration); } } @@ -263,7 +265,7 @@ public class CallerInfoAsyncQuery { */ @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - Rlog.d(LOG_TAG, "##### onQueryComplete() ##### query complete for token: " + token); + Log.d(LOG_TAG, "##### onQueryComplete() ##### query complete for token: " + token); //get the cookie and notify the listener. CookieWrapper cw = (CookieWrapper) cookie; @@ -272,7 +274,7 @@ public class CallerInfoAsyncQuery { // from within this code. // However, if there is any code that calls this method, we should // check the parameters to make sure they're viable. - Rlog.i(LOG_TAG, "Cookie is null, ignoring onQueryComplete() request."); + Log.i(LOG_TAG, "Cookie is null, ignoring onQueryComplete() request."); if (cursor != null) { cursor.close(); } @@ -321,16 +323,16 @@ public class CallerInfoAsyncQuery { // comments at the top of CallerInfo class). mCallerInfo = new CallerInfo().markAsEmergency(mContext); } else if (cw.event == EVENT_VOICEMAIL_NUMBER) { - mCallerInfo = new CallerInfo().markAsVoiceMail(cw.subId); + mCallerInfo = new CallerInfo().markAsVoiceMail(mContext, cw.subId); } else { mCallerInfo = CallerInfo.getCallerInfo(mContext, mQueryUri, cursor); - if (DBG) Rlog.d(LOG_TAG, "==> Got mCallerInfo: " + mCallerInfo); + if (DBG) Log.d(LOG_TAG, "==> Got mCallerInfo: " + mCallerInfo); CallerInfo newCallerInfo = CallerInfo.doSecondaryLookupIfNecessary( mContext, cw.number, mCallerInfo); if (newCallerInfo != mCallerInfo) { mCallerInfo = newCallerInfo; - if (DBG) Rlog.d(LOG_TAG, "#####async contact look up with numeric username" + if (DBG) Log.d(LOG_TAG, "#####async contact look up with numeric username" + mCallerInfo); } @@ -346,7 +348,7 @@ public class CallerInfoAsyncQuery { // the geo description, so it would be unnecessary to query it. if (ENABLE_UNKNOWN_NUMBER_GEO_DESCRIPTION) { if (TextUtils.isEmpty(mCallerInfo.getName())) { - if (DBG) Rlog.d(LOG_TAG, "start querying geo description"); + if (DBG) Log.d(LOG_TAG, "start querying geo description"); cw.event = EVENT_GET_GEO_DESCRIPTION; startQuery(token, cw, null, null, null, null, null); return; @@ -354,7 +356,7 @@ public class CallerInfoAsyncQuery { } } - if (DBG) Rlog.d(LOG_TAG, "constructing CallerInfo object for token: " + token); + if (DBG) Log.d(LOG_TAG, "constructing CallerInfo object for token: " + token); //notify that we can clean up the queue after this. CookieWrapper endMarker = new CookieWrapper(); @@ -367,14 +369,14 @@ public class CallerInfoAsyncQuery { mPendingListenerCallbacks.add(new Runnable() { @Override public void run() { - if (DBG) Rlog.d(LOG_TAG, "notifying listener: " + if (DBG) Log.d(LOG_TAG, "notifying listener: " + cw.listener.getClass().toString() + " for token: " + token + mCallerInfo); cw.listener.onQueryComplete(token, cw.cookie, mCallerInfo); } }); } else { - Rlog.w(LOG_TAG, "There is no listener to notify for this query."); + Log.w(LOG_TAG, "There is no listener to notify for this query."); } if (cursor != null) { @@ -399,7 +401,7 @@ public class CallerInfoAsyncQuery { CallerInfoAsyncQuery c = new CallerInfoAsyncQuery(); c.allocate(context, contactRef); - if (DBG) Rlog.d(LOG_TAG, "starting query for URI: " + contactRef + " handler: " + c.toString()); + if (DBG) Log.d(LOG_TAG, "starting query for URI: " + contactRef + " handler: " + c.toString()); //create cookieWrapper, start query CookieWrapper cw = new CookieWrapper(); @@ -445,9 +447,9 @@ public class CallerInfoAsyncQuery { OnQueryCompleteListener listener, Object cookie, int subId) { if (DBG) { - Rlog.d(LOG_TAG, "##### CallerInfoAsyncQuery startQuery()... #####"); - Rlog.d(LOG_TAG, "- number: " + /*number*/ "xxxxxxx"); - Rlog.d(LOG_TAG, "- cookie: " + cookie); + Log.d(LOG_TAG, "##### CallerInfoAsyncQuery startQuery()... #####"); + Log.d(LOG_TAG, "- number: " + /*number*/ "xxxxxxx"); + Log.d(LOG_TAG, "- cookie: " + cookie); } // Construct the URI object and query params, and start the query. @@ -459,7 +461,7 @@ public class CallerInfoAsyncQuery { .build(); if (DBG) { - Rlog.d(LOG_TAG, "==> contactRef: " + sanitizeUriToString(contactRef)); + Log.d(LOG_TAG, "==> contactRef: " + sanitizeUriToString(contactRef)); } CallerInfoAsyncQuery c = new CallerInfoAsyncQuery(); @@ -496,8 +498,8 @@ public class CallerInfoAsyncQuery { */ public void addQueryListener(int token, OnQueryCompleteListener listener, Object cookie) { - if (DBG) Rlog.d(LOG_TAG, "adding listener to query: " + sanitizeUriToString(mHandler.mQueryUri) + - " handler: " + mHandler.toString()); + if (DBG) Log.d(LOG_TAG, "adding listener to query: " + + sanitizeUriToString(mHandler.mQueryUri) + " handler: " + mHandler.toString()); //create cookieWrapper, add query request to end of queue. CookieWrapper cw = new CookieWrapper(); diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index 5dcc7518ab72..f79aef3ae5c9 100644 --- a/telephony/common/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java @@ -47,6 +47,8 @@ import com.android.internal.content.PackageMonitor; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -56,6 +58,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; + + /** * Class for managing the primary application that we will deliver SMS/MMS messages to * @@ -90,6 +94,7 @@ public final class SmsApplication { /** * Name of this SMS app for display. */ + @UnsupportedAppUsage private String mApplicationName; /** @@ -223,6 +228,7 @@ public final class SmsApplication { * Implement ACTION_SENDTO intent. * Support smsto Uri scheme. */ + @UnsupportedAppUsage public static Collection<SmsApplicationData> getApplicationCollection(Context context) { return getApplicationCollectionAsUser(context, getIncomingUserId(context)); } @@ -578,6 +584,7 @@ public final class SmsApplication { * Sets the specified package as the default SMS/MMS application. The caller of this method * needs to have permission to set AppOps and write to secure settings. */ + @UnsupportedAppUsage public static void setDefaultApplication(String packageName, Context context) { setDefaultApplicationAsUser(packageName, context, getIncomingUserId(context)); } @@ -825,6 +832,7 @@ public final class SmsApplication { sSmsPackageMonitor.register(context, context.getMainLooper(), UserHandle.ALL, false); } + @UnsupportedAppUsage private static void configurePreferredActivity(PackageManager packageManager, ComponentName componentName, int userId) { // Add the four activity preferences we want to direct to this app. @@ -867,6 +875,7 @@ public final class SmsApplication { * Returns SmsApplicationData for this package if this package is capable of being set as the * default SMS application. */ + @UnsupportedAppUsage public static SmsApplicationData getSmsApplicationData(String packageName, Context context) { Collection<SmsApplicationData> applications = getApplicationCollection(context); return getApplicationForPackage(applications, packageName); @@ -878,6 +887,7 @@ public final class SmsApplication { * @param updateIfNeeded update the default app if there is no valid default app configured. * @return component name of the app and class to deliver SMS messages to */ + @UnsupportedAppUsage public static ComponentName getDefaultSmsApplication(Context context, boolean updateIfNeeded) { return getDefaultSmsApplicationAsUser(context, updateIfNeeded, getIncomingUserId(context)); } @@ -912,6 +922,7 @@ public final class SmsApplication { * @param updateIfNeeded update the default app if there is no valid default app configured. * @return component name of the app and class to deliver MMS messages to */ + @UnsupportedAppUsage public static ComponentName getDefaultMmsApplication(Context context, boolean updateIfNeeded) { int userId = getIncomingUserId(context); final long token = Binder.clearCallingIdentity(); @@ -935,6 +946,7 @@ public final class SmsApplication { * @param updateIfNeeded update the default app if there is no valid default app configured. * @return component name of the app and class to direct Respond Via Message intent to */ + @UnsupportedAppUsage public static ComponentName getDefaultRespondViaMessageApplication(Context context, boolean updateIfNeeded) { int userId = getIncomingUserId(context); @@ -1035,6 +1047,7 @@ public final class SmsApplication { * <p> * Caller must pass in the correct user context if calling from a singleton service. */ + @UnsupportedAppUsage public static boolean shouldWriteMessageForPackage(String packageName, Context context) { return !isDefaultSmsApplication(context, packageName); } @@ -1046,6 +1059,7 @@ public final class SmsApplication { * @param packageName the name of the package to be checked * @return true if the package is default sms app or bluetooth */ + @UnsupportedAppUsage public static boolean isDefaultSmsApplication(Context context, String packageName) { if (packageName == null) { return false; diff --git a/telephony/common/com/google/android/mms/pdu/PduPersister.java b/telephony/common/com/google/android/mms/pdu/PduPersister.java index 93f30657bf1b..95ae4096ed86 100755 --- a/telephony/common/com/google/android/mms/pdu/PduPersister.java +++ b/telephony/common/com/google/android/mms/pdu/PduPersister.java @@ -1548,6 +1548,7 @@ public class PduPersister { public void release() { Uri uri = Uri.parse(TEMPORARY_DRM_OBJECT_URI); SqliteWrapper.delete(mContext, mContentResolver, uri, null, null); + mDrmManagerClient.release(); } /** diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index bd3a2fbdce15..90a61f9aa207 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2842,6 +2842,28 @@ public class CarrierConfigManager { "ping_test_before_data_switch_bool"; /** + * Controls whether to switch data to primary from opportunistic subscription + * if primary is out of service. This control only affects system or 1st party app + * initiated data switch, but will not override data switch initiated by privileged carrier apps + * This carrier config is used to disable this feature. + * @hide + */ + public static final String KEY_SWITCH_DATA_TO_PRIMARY_IF_PRIMARY_IS_OOS_BOOL = + "switch_data_to_primary_if_primary_is_oos_bool"; + + /** + * Controls back off time in milli seconds for switching back to + * opportunistic subscription. This time will be added to + * {@link CarrierConfigManager#KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG} to + * determine hysteresis time if there is frequent switching + * (determined by system app or 1st party app) between primary and opportunistic + * subscription. + * @hide + */ + public static final String KEY_OPPORTUNISTIC_NETWORK_BACKOFF_TIME_LONG = + "opportunistic_network_backoff_time_long"; + + /** * Indicates zero or more emergency number prefix(es), because some carrier requires * if users dial an emergency number address with a specific prefix, the combination of the * prefix and the address is also a valid emergency number to dial. For example, an emergency @@ -3648,6 +3670,9 @@ public class CarrierConfigManager { /* Default value is 3 seconds. */ sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG, 3000); sDefaults.putBoolean(KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL, true); + sDefaults.putBoolean(KEY_SWITCH_DATA_TO_PRIMARY_IF_PRIMARY_IS_OOS_BOOL, true); + /* Default value is 10 seconds. */ + sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_BACKOFF_TIME_LONG, 10000); sDefaults.putAll(Gps.getDefaults()); sDefaults.putAll(Wifi.getDefaults()); sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY, diff --git a/telephony/java/android/telephony/CellBroadcastService.java b/telephony/java/android/telephony/CellBroadcastService.java index cb342c6df9ae..f841df2320e0 100644 --- a/telephony/java/android/telephony/CellBroadcastService.java +++ b/telephony/java/android/telephony/CellBroadcastService.java @@ -22,9 +22,14 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.app.Service; import android.content.Intent; +import android.os.Bundle; import android.os.IBinder; +import android.os.RemoteCallback; import android.telephony.cdma.CdmaSmsCbProgramData; +import java.util.List; +import java.util.function.Consumer; + /** * A service which exposes the cell broadcast handling module to the system. * <p> @@ -48,6 +53,7 @@ import android.telephony.cdma.CdmaSmsCbProgramData; * </service> * </manifest> * }</pre> + * * @hide */ @SystemApi @@ -64,21 +70,38 @@ public abstract class CellBroadcastService extends Service { /** * Handle a GSM cell broadcast SMS message forwarded from the system. + * * @param slotIndex the index of the slot which received the message - * @param message the SMS PDU + * @param message the SMS PDU */ public abstract void onGsmCellBroadcastSms(int slotIndex, @NonNull byte[] message); /** * Handle a CDMA cell broadcast SMS message forwarded from the system. - * @param slotIndex the index of the slot which received the message - * @param bearerData the CDMA SMS bearer data + * + * @param slotIndex the index of the slot which received the message + * @param bearerData the CDMA SMS bearer data * @param serviceCategory the CDMA SCPT service category */ public abstract void onCdmaCellBroadcastSms(int slotIndex, @NonNull byte[] bearerData, @CdmaSmsCbProgramData.Category int serviceCategory); /** + * Handle a CDMA cell broadcast SMS message forwarded from the system. + * + * @param slotIndex the index of the slot which received the message + * @param smsCbProgramData the SMS CB program data of the message + * @param originatingAddress the originating address of the message, as a non-separated dial + * string + * @param callback a callback to run after each cell broadcast receiver has handled + * the SCP message. The bundle will contain a non-separated + * dial string as and an ArrayList of {@link CdmaSmsCbProgramResults}. + */ + public abstract void onCdmaScpMessage(int slotIndex, + @NonNull List<CdmaSmsCbProgramData> smsCbProgramData, + @NonNull String originatingAddress, @NonNull Consumer<Bundle> callback); + + /** * If overriding this method, call through to the super method for any unknown actions. * {@inheritDoc} */ @@ -92,13 +115,15 @@ public abstract class CellBroadcastService extends Service { /** * A wrapper around ICellBroadcastService that forwards calls to implementations of * {@link CellBroadcastService}. + * * @hide */ public class ICellBroadcastServiceWrapper extends ICellBroadcastService.Stub { /** * Handle a GSM cell broadcast SMS. + * * @param slotIndex the index of the slot which received the broadcast - * @param message the SMS message PDU + * @param message the SMS message PDU */ @Override public void handleGsmCellBroadcastSms(int slotIndex, byte[] message) { @@ -107,8 +132,9 @@ public abstract class CellBroadcastService extends Service { /** * Handle a CDMA cell broadcast SMS. - * @param slotIndex the index of the slot which received the broadcast - * @param bearerData the CDMA SMS bearer data + * + * @param slotIndex the index of the slot which received the broadcast + * @param bearerData the CDMA SMS bearer data * @param serviceCategory the CDMA SCPT service category */ @Override @@ -117,5 +143,25 @@ public abstract class CellBroadcastService extends Service { CellBroadcastService.this.onCdmaCellBroadcastSms(slotIndex, bearerData, serviceCategory); } + + /** + * Handle a CDMA Service Category Program message. + * + * @param slotIndex the index of the slot which received the message + * @param smsCbProgramData the SMS CB program data of the message + * @param originatingAddress the originating address of the message + * @param callback a callback to run after each cell broadcast receiver has + * handled the SCP message + */ + @Override + public void handleCdmaScpMessage(int slotIndex, + List<CdmaSmsCbProgramData> smsCbProgramData, String originatingAddress, + RemoteCallback callback) { + Consumer<Bundle> consumer = bundle -> { + callback.sendResult(bundle); + }; + CellBroadcastService.this.onCdmaScpMessage(slotIndex, smsCbProgramData, + originatingAddress, consumer); + } } } diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index aa7e21a82500..85110c22aa18 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; @@ -369,7 +370,7 @@ public final class DisconnectCause { * @hide */ @UnsupportedAppUsage - public static String toString(int cause) { + public static @NonNull String toString(int cause) { switch (cause) { case NOT_DISCONNECTED: return "NOT_DISCONNECTED"; diff --git a/telephony/java/android/telephony/ICellBroadcastService.aidl b/telephony/java/android/telephony/ICellBroadcastService.aidl index bcd6cc546eed..11263d99cb8f 100644 --- a/telephony/java/android/telephony/ICellBroadcastService.aidl +++ b/telephony/java/android/telephony/ICellBroadcastService.aidl @@ -16,6 +16,9 @@ package android.telephony; +import android.os.RemoteCallback; +import android.telephony.cdma.CdmaSmsCbProgramData; + /** * Service bound to by the system to allow custom handling of cell broadcast messages. * <p> @@ -29,4 +32,8 @@ interface ICellBroadcastService { /** @see android.telephony.CellBroadcastService#onCdmaCellBroadcastSms */ oneway void handleCdmaCellBroadcastSms(int slotId, in byte[] bearerData, int serviceCategory); + + /** @see android.telephony.CellBroadcastService#onCdmaScpMessage */ + oneway void handleCdmaScpMessage(int slotId, in List<CdmaSmsCbProgramData> programData, + String originatingAddress, in RemoteCallback callback); } diff --git a/telephony/java/android/telephony/ICellInfoCallback.aidl b/telephony/java/android/telephony/ICellInfoCallback.aidl index ee3c1b1be6d9..60732a3db59a 100644 --- a/telephony/java/android/telephony/ICellInfoCallback.aidl +++ b/telephony/java/android/telephony/ICellInfoCallback.aidl @@ -16,7 +16,6 @@ package android.telephony; -import android.os.ParcelableException; import android.telephony.CellInfo; import java.util.List; @@ -28,5 +27,5 @@ import java.util.List; oneway interface ICellInfoCallback { void onCellInfo(in List<CellInfo> state); - void onError(in int errorCode, in ParcelableException detail); + void onError(in int errorCode, in String exceptionName, in String message); } diff --git a/telephony/java/android/telephony/ImsManager.java b/telephony/java/android/telephony/ImsManager.java new file mode 100644 index 000000000000..02d8be3ccfd5 --- /dev/null +++ b/telephony/java/android/telephony/ImsManager.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.telephony.ims; + +import android.annotation.SystemService; +import android.content.Context; +import android.telephony.SubscriptionManager; + +/** + * Provides access to information about Telephony IMS services on the device. + * + * @hide + */ +@SystemService(Context.TELEPHONY_IMS_SERVICE) +public class ImsManager { + + private Context mContext; + + public ImsManager(Context context) { + mContext = context; + } + + /** + * Create an instance of ImsRcsManager for the subscription id specified. + * + * @param subscriptionId The ID of the subscription that this ImsRcsManager will use. + * @throws IllegalArgumentException if the subscription is invalid. + * @return a ImsRcsManager instance with the specific subscription ID. + */ + public ImsRcsManager getImsRcsManager(int subscriptionId) { + if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) { + throw new IllegalArgumentException("Invalid subscription ID: " + subscriptionId); + } + + return new ImsRcsManager(mContext, subscriptionId); + } + + /** + * Create an instance of ImsMmTelManager for the subscription id specified. + * + * @param subscriptionId The ID of the subscription that this ImsMmTelManager will use. + * @throws IllegalArgumentException if the subscription is invalid. + * @return a ImsMmTelManager instance with the specific subscription ID. + */ + public ImsMmTelManager getImsMmTelManager(int subscriptionId) { + if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) { + throw new IllegalArgumentException("Invalid subscription ID: " + subscriptionId); + } + + return new ImsMmTelManager(subscriptionId); + } +} diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index af3ba5e44158..4a1bc1f6343f 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -16,12 +16,12 @@ package android.telephony; -import com.android.i18n.phonenumbers.NumberParseException; -import com.android.i18n.phonenumbers.PhoneNumberUtil; -import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; -import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; +import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_IDP_STRING; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; import android.content.Context; @@ -42,7 +42,10 @@ import android.text.TextUtils; import android.text.style.TtsSpan; import android.util.SparseIntArray; -import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_IDP_STRING; +import com.android.i18n.phonenumbers.NumberParseException; +import com.android.i18n.phonenumbers.PhoneNumberUtil; +import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; +import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -2247,8 +2250,10 @@ public class PhoneNumberUtils { * to read the VM number. * @hide */ - @UnsupportedAppUsage - public static boolean isVoiceMailNumber(Context context, int subId, String number) { + @SystemApi + @TestApi + public static boolean isVoiceMailNumber(@NonNull Context context, int subId, + @Nullable String number) { String vmNumber, mdn; try { final TelephonyManager tm; @@ -2734,8 +2739,9 @@ public class PhoneNumberUtils { * @param number * @return true if number contains @ */ - @UnsupportedAppUsage - public static boolean isUriNumber(String number) { + @SystemApi + @TestApi + public static boolean isUriNumber(@Nullable String number) { // Note we allow either "@" or "%40" to indicate a URI, in case // the passed-in string is URI-escaped. (Neither "@" nor "%40" // will ever be found in a legal PSTN number.) @@ -2752,8 +2758,9 @@ public class PhoneNumberUtils { * * @hide */ - @UnsupportedAppUsage - public static String getUsernameFromUriNumber(String number) { + @SystemApi + @TestApi + public static @NonNull String getUsernameFromUriNumber(@NonNull String number) { // The delimiter between username and domain name can be // either "@" or "%40" (the URI-escaped equivalent.) int delimiterIndex = number.indexOf('@'); diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 3157e12c41b6..54e87afb2da9 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -28,7 +28,6 @@ import android.annotation.UnsupportedAppUsage; import android.app.ActivityThread; import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageManager; import android.database.CursorWindow; import android.net.Uri; @@ -37,7 +36,6 @@ import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; -import android.provider.Telephony; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; @@ -289,12 +287,6 @@ public final class SmsManager { */ public static final int SMS_MESSAGE_PERIOD_NOT_SPECIFIED = -1; - /** - * Extra key passed into a PendingIntent when the SMS operation failed due to there being no - * default set. - */ - private static final String NO_DEFAULT_EXTRA = "noDefault"; - // result of asking the user for a subscription to perform an operation. private interface SubscriptionResolverResult { void onSuccess(int subId); @@ -335,9 +327,59 @@ public final class SmsManager { * <code>RESULT_ERROR_RADIO_OFF</code><br> * <code>RESULT_ERROR_NULL_PDU</code><br> * <code>RESULT_ERROR_NO_SERVICE</code><br> - * For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.<br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br> + * <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br> + * <code>RESULT_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_NETWORK_REJECT</code><br> + * <code>RESULT_INVALID_ARGUMENTS</code><br> + * <code>RESULT_INVALID_STATE</code><br> + * <code>RESULT_NO_MEMORY</code><br> + * <code>RESULT_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_SYSTEM_ERROR</code><br> + * <code>RESULT_MODEM_ERROR</code><br> + * <code>RESULT_NETWORK_ERROR</code><br> + * <code>RESULT_ENCODING_ERROR</code><br> + * <code>RESULT_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_INTERNAL_ERROR</code><br> + * <code>RESULT_NO_RESOURCES</code><br> + * <code>RESULT_CANCELLED</code><br> + * <code>RESULT_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_NO_BLUETOOTH_SERVICE</code><br> + * <code>RESULT_INVALID_BLUETOOTH_ADDRESS</code><br> + * <code>RESULT_BLUETOOTH_DISCONNECTED</code><br> + * <code>RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br> + * <code>RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br> + * <code>RESULT_SMS_SEND_RETRY_FAILED</code><br> + * <code>RESULT_REMOTE_EXCEPTION</code><br> + * <code>RESULT_NO_DEFAULT_SMS_APP</code><br> + * <code>RESULT_RIL_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br> + * <code>RESULT_RIL_NETWORK_REJECT</code><br> + * <code>RESULT_RIL_INVALID_STATE</code><br> + * <code>RESULT_RIL_INVALID_ARGUMENTS</code><br> + * <code>RESULT_RIL_NO_MEMORY</code><br> + * <code>RESULT_RIL_REQUEST_RATE_LIMITED</code><br> + * <code>RESULT_RIL_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_RIL_SYSTEM_ERR</code><br> + * <code>RESULT_RIL_ENCODING_ERR</code><br> + * <code>RESULT_RIL_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_RIL_MODEM_ERR</code><br> + * <code>RESULT_RIL_NETWORK_ERR</code><br> + * <code>RESULT_RIL_INTERNAL_ERR</code><br> + * <code>RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_RIL_INVALID_MODEM_STATE</code><br> + * <code>RESULT_RIL_NETWORK_NOT_READY</code><br> + * <code>RESULT_RIL_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_RIL_NO_RESOURCES</code><br> + * <code>RESULT_RIL_CANCELLED</code><br> + * <code>RESULT_RIL_SIM_ABSENT</code><br> + * For <code>RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors, + * the sentIntent may include the extra "errorCode" containing a radio technology specific + * value, generally only useful for troubleshooting.<br> * The per-application based SMS control checks sentIntent. If sentIntent * is NULL the caller will be checked against all unknown applications, * which cause smaller number of SMS to be sent in checking period. @@ -377,9 +419,60 @@ public final class SmsManager { * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> * <code>RESULT_ERROR_RADIO_OFF</code><br> * <code>RESULT_ERROR_NULL_PDU</code><br> - * For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.<br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br> + * <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br> + * <code>RESULT_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_NETWORK_REJECT</code><br> + * <code>RESULT_INVALID_ARGUMENTS</code><br> + * <code>RESULT_INVALID_STATE</code><br> + * <code>RESULT_NO_MEMORY</code><br> + * <code>RESULT_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_SYSTEM_ERROR</code><br> + * <code>RESULT_MODEM_ERROR</code><br> + * <code>RESULT_NETWORK_ERROR</code><br> + * <code>RESULT_ENCODING_ERROR</code><br> + * <code>RESULT_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_INTERNAL_ERROR</code><br> + * <code>RESULT_NO_RESOURCES</code><br> + * <code>RESULT_CANCELLED</code><br> + * <code>RESULT_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_NO_BLUETOOTH_SERVICE</code><br> + * <code>RESULT_INVALID_BLUETOOTH_ADDRESS</code><br> + * <code>RESULT_BLUETOOTH_DISCONNECTED</code><br> + * <code>RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br> + * <code>RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br> + * <code>RESULT_SMS_SEND_RETRY_FAILED</code><br> + * <code>RESULT_REMOTE_EXCEPTION</code><br> + * <code>RESULT_NO_DEFAULT_SMS_APP</code><br> + * <code>RESULT_RIL_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br> + * <code>RESULT_RIL_NETWORK_REJECT</code><br> + * <code>RESULT_RIL_INVALID_STATE</code><br> + * <code>RESULT_RIL_INVALID_ARGUMENTS</code><br> + * <code>RESULT_RIL_NO_MEMORY</code><br> + * <code>RESULT_RIL_REQUEST_RATE_LIMITED</code><br> + * <code>RESULT_RIL_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_RIL_SYSTEM_ERR</code><br> + * <code>RESULT_RIL_ENCODING_ERR</code><br> + * <code>RESULT_RIL_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_RIL_MODEM_ERR</code><br> + * <code>RESULT_RIL_NETWORK_ERR</code><br> + * <code>RESULT_RIL_INTERNAL_ERR</code><br> + * <code>RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_RIL_INVALID_MODEM_STATE</code><br> + * <code>RESULT_RIL_NETWORK_NOT_READY</code><br> + * <code>RESULT_RIL_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_RIL_NO_RESOURCES</code><br> + * <code>RESULT_RIL_CANCELLED</code><br> + * <code>RESULT_RIL_SIM_ABSENT</code><br> + * For <code>RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors, + * the sentIntent may include the extra "errorCode" containing a radio technology specific + * value, generally only useful for troubleshooting.<br> * The per-application based SMS control checks sentIntent. If sentIntent * is NULL the caller will be checked against all unknown applications, * which cause smaller number of SMS to be sent in checking period. @@ -450,13 +543,13 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendTextMessageInternal: Couldn't send SMS, exception - " + e.getMessage()); - notifySmsGenericError(sentIntent); + notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION); } } @Override public void onFailure() { - notifySmsErrorNoDefaultSet(context, sentIntent); + notifySmsError(sentIntent, RESULT_NO_DEFAULT_SMS_APP); } }); } else { @@ -470,7 +563,7 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendTextMessageInternal (no persist): Couldn't send SMS, exception - " + e.getMessage()); - notifySmsGenericError(sentIntent); + notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION); } } } @@ -563,13 +656,13 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendTextMessageInternal: Couldn't send SMS, exception - " + e.getMessage()); - notifySmsGenericError(sentIntent); + notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION); } } @Override public void onFailure() { - notifySmsErrorNoDefaultSet(context, sentIntent); + notifySmsError(sentIntent, RESULT_NO_DEFAULT_SMS_APP); } }); } else { @@ -585,7 +678,7 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendTextMessageInternal(no persist): Couldn't send SMS, exception - " + e.getMessage()); - notifySmsGenericError(sentIntent); + notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION); } } } @@ -667,7 +760,7 @@ public final class SmsManager { } catch (RemoteException ex) { try { if (receivedIntent != null) { - receivedIntent.send(Telephony.Sms.Intents.RESULT_SMS_GENERIC_ERROR); + receivedIntent.send(RESULT_REMOTE_EXCEPTION); } } catch (PendingIntent.CanceledException cx) { // Don't worry about it, we do not need to notify the caller if this is the case. @@ -723,12 +816,63 @@ public final class SmsManager { * broadcast when the corresponding message part has been sent. * The result code will be <code>Activity.RESULT_OK</code> for success, * or one of these errors:<br> - * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> - * <code>RESULT_ERROR_RADIO_OFF</code><br> - * <code>RESULT_ERROR_NULL_PDU</code><br> - * For <code>RESULT_ERROR_GENERIC_FAILURE</code> each sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.<br> + * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> + * <code>RESULT_ERROR_RADIO_OFF</code><br> + * <code>RESULT_ERROR_NULL_PDU</code><br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br> + * <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br> + * <code>RESULT_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_NETWORK_REJECT</code><br> + * <code>RESULT_INVALID_ARGUMENTS</code><br> + * <code>RESULT_INVALID_STATE</code><br> + * <code>RESULT_NO_MEMORY</code><br> + * <code>RESULT_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_SYSTEM_ERROR</code><br> + * <code>RESULT_MODEM_ERROR</code><br> + * <code>RESULT_NETWORK_ERROR</code><br> + * <code>RESULT_ENCODING_ERROR</code><br> + * <code>RESULT_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_INTERNAL_ERROR</code><br> + * <code>RESULT_NO_RESOURCES</code><br> + * <code>RESULT_CANCELLED</code><br> + * <code>RESULT_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_NO_BLUETOOTH_SERVICE</code><br> + * <code>RESULT_INVALID_BLUETOOTH_ADDRESS</code><br> + * <code>RESULT_BLUETOOTH_DISCONNECTED</code><br> + * <code>RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br> + * <code>RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br> + * <code>RESULT_SMS_SEND_RETRY_FAILED</code><br> + * <code>RESULT_REMOTE_EXCEPTION</code><br> + * <code>RESULT_NO_DEFAULT_SMS_APP</code><br> + * <code>RESULT_RIL_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br> + * <code>RESULT_RIL_NETWORK_REJECT</code><br> + * <code>RESULT_RIL_INVALID_STATE</code><br> + * <code>RESULT_RIL_INVALID_ARGUMENTS</code><br> + * <code>RESULT_RIL_NO_MEMORY</code><br> + * <code>RESULT_RIL_REQUEST_RATE_LIMITED</code><br> + * <code>RESULT_RIL_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_RIL_SYSTEM_ERR</code><br> + * <code>RESULT_RIL_ENCODING_ERR</code><br> + * <code>RESULT_RIL_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_RIL_MODEM_ERR</code><br> + * <code>RESULT_RIL_NETWORK_ERR</code><br> + * <code>RESULT_RIL_INTERNAL_ERR</code><br> + * <code>RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_RIL_INVALID_MODEM_STATE</code><br> + * <code>RESULT_RIL_NETWORK_NOT_READY</code><br> + * <code>RESULT_RIL_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_RIL_NO_RESOURCES</code><br> + * <code>RESULT_RIL_CANCELLED</code><br> + * <code>RESULT_RIL_SIM_ABSENT</code><br> + * For <code>RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors, + * the sentIntent may include the extra "errorCode" containing a radio technology specific + * value, generally only useful for troubleshooting.<br> * The per-application based SMS control checks sentIntent. If sentIntent * is NULL the caller will be checked against all unknown applications, * which cause smaller number of SMS to be sent in checking period. @@ -765,10 +909,12 @@ public final class SmsManager { * {@link ActivityThread#currentPackageName()} is null. * @hide */ - public void sendMultipartTextMessageExternal( - String destinationAddress, String scAddress, ArrayList<String> parts, - ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents, - String packageName) { + @SystemApi + @TestApi + public void sendMultipartTextMessage( + @NonNull String destinationAddress, @NonNull String scAddress, + @NonNull List<String> parts, @Nullable List<PendingIntent> sentIntents, + @Nullable List<PendingIntent> deliveryIntents, @NonNull String packageName) { sendMultipartTextMessageInternal(destinationAddress, scAddress, parts, sentIntents, deliveryIntents, true /* persistMessage*/, ActivityThread.currentPackageName() == null @@ -810,13 +956,13 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendMultipartTextMessageInternal: Couldn't send SMS - " + e.getMessage()); - notifySmsGenericError(sentIntents); + notifySmsError(sentIntents, RESULT_REMOTE_EXCEPTION); } } @Override public void onFailure() { - notifySmsErrorNoDefaultSet(context, sentIntents); + notifySmsError(sentIntents, RESULT_NO_DEFAULT_SMS_APP); } }); } else { @@ -831,7 +977,7 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendMultipartTextMessageInternal: Couldn't send SMS - " + e.getMessage()); - notifySmsGenericError(sentIntents); + notifySmsError(sentIntents, RESULT_REMOTE_EXCEPTION); } } } else { @@ -910,12 +1056,63 @@ public final class SmsManager { * broadcast when the corresponding message part has been sent. * The result code will be <code>Activity.RESULT_OK</code> for success, * or one of these errors:<br> - * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> - * <code>RESULT_ERROR_RADIO_OFF</code><br> - * <code>RESULT_ERROR_NULL_PDU</code><br> - * For <code>RESULT_ERROR_GENERIC_FAILURE</code> each sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.<br> + * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> + * <code>RESULT_ERROR_RADIO_OFF</code><br> + * <code>RESULT_ERROR_NULL_PDU</code><br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br> + * <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br> + * <code>RESULT_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_NETWORK_REJECT</code><br> + * <code>RESULT_INVALID_ARGUMENTS</code><br> + * <code>RESULT_INVALID_STATE</code><br> + * <code>RESULT_NO_MEMORY</code><br> + * <code>RESULT_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_SYSTEM_ERROR</code><br> + * <code>RESULT_MODEM_ERROR</code><br> + * <code>RESULT_NETWORK_ERROR</code><br> + * <code>RESULT_ENCODING_ERROR</code><br> + * <code>RESULT_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_INTERNAL_ERROR</code><br> + * <code>RESULT_NO_RESOURCES</code><br> + * <code>RESULT_CANCELLED</code><br> + * <code>RESULT_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_NO_BLUETOOTH_SERVICE</code><br> + * <code>RESULT_INVALID_BLUETOOTH_ADDRESS</code><br> + * <code>RESULT_BLUETOOTH_DISCONNECTED</code><br> + * <code>RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br> + * <code>RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br> + * <code>RESULT_SMS_SEND_RETRY_FAILED</code><br> + * <code>RESULT_REMOTE_EXCEPTION</code><br> + * <code>RESULT_NO_DEFAULT_SMS_APP</code><br> + * <code>RESULT_RIL_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br> + * <code>RESULT_RIL_NETWORK_REJECT</code><br> + * <code>RESULT_RIL_INVALID_STATE</code><br> + * <code>RESULT_RIL_INVALID_ARGUMENTS</code><br> + * <code>RESULT_RIL_NO_MEMORY</code><br> + * <code>RESULT_RIL_REQUEST_RATE_LIMITED</code><br> + * <code>RESULT_RIL_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_RIL_SYSTEM_ERR</code><br> + * <code>RESULT_RIL_ENCODING_ERR</code><br> + * <code>RESULT_RIL_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_RIL_MODEM_ERR</code><br> + * <code>RESULT_RIL_NETWORK_ERR</code><br> + * <code>RESULT_RIL_INTERNAL_ERR</code><br> + * <code>RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_RIL_INVALID_MODEM_STATE</code><br> + * <code>RESULT_RIL_NETWORK_NOT_READY</code><br> + * <code>RESULT_RIL_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_RIL_NO_RESOURCES</code><br> + * <code>RESULT_RIL_CANCELLED</code><br> + * <code>RESULT_RIL_SIM_ABSENT</code><br> + * For <code>RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors, + * the sentIntent may include the extra "errorCode" containing a radio technology specific + * value, generally only useful for troubleshooting.<br> * The per-application based SMS control checks sentIntent. If sentIntent * is NULL the caller will be checked against all unknown applications, * which cause smaller number of SMS to be sent in checking period. @@ -993,13 +1190,13 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendMultipartTextMessageInternal: Couldn't send SMS - " + e.getMessage()); - notifySmsGenericError(sentIntents); + notifySmsError(sentIntents, RESULT_REMOTE_EXCEPTION); } } @Override public void onFailure() { - notifySmsErrorNoDefaultSet(context, sentIntents); + notifySmsError(sentIntents, RESULT_NO_DEFAULT_SMS_APP); } }); } else { @@ -1015,7 +1212,7 @@ public final class SmsManager { } catch (RemoteException e) { Log.e(TAG, "sendMultipartTextMessageInternal (no persist): Couldn't send SMS - " + e.getMessage()); - notifySmsGenericError(sentIntents); + notifySmsError(sentIntents, RESULT_REMOTE_EXCEPTION); } } } else { @@ -1060,9 +1257,60 @@ public final class SmsManager { * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> * <code>RESULT_ERROR_RADIO_OFF</code><br> * <code>RESULT_ERROR_NULL_PDU</code><br> - * For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.<br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_NO_SERVICE</code><br> + * <code>RESULT_ERROR_LIMIT_EXCEEDED</code><br> + * <code>RESULT_ERROR_FDN_CHECK_FAILURE</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br> + * <code>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br> + * <code>RESULT_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_NETWORK_REJECT</code><br> + * <code>RESULT_INVALID_ARGUMENTS</code><br> + * <code>RESULT_INVALID_STATE</code><br> + * <code>RESULT_NO_MEMORY</code><br> + * <code>RESULT_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_SYSTEM_ERROR</code><br> + * <code>RESULT_MODEM_ERROR</code><br> + * <code>RESULT_NETWORK_ERROR</code><br> + * <code>RESULT_ENCODING_ERROR</code><br> + * <code>RESULT_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_INTERNAL_ERROR</code><br> + * <code>RESULT_NO_RESOURCES</code><br> + * <code>RESULT_CANCELLED</code><br> + * <code>RESULT_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_NO_BLUETOOTH_SERVICE</code><br> + * <code>RESULT_INVALID_BLUETOOTH_ADDRESS</code><br> + * <code>RESULT_BLUETOOTH_DISCONNECTED</code><br> + * <code>RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br> + * <code>RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br> + * <code>RESULT_SMS_SEND_RETRY_FAILED</code><br> + * <code>RESULT_REMOTE_EXCEPTION</code><br> + * <code>RESULT_NO_DEFAULT_SMS_APP</code><br> + * <code>RESULT_RIL_RADIO_NOT_AVAILABLE</code><br> + * <code>RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br> + * <code>RESULT_RIL_NETWORK_REJECT</code><br> + * <code>RESULT_RIL_INVALID_STATE</code><br> + * <code>RESULT_RIL_INVALID_ARGUMENTS</code><br> + * <code>RESULT_RIL_NO_MEMORY</code><br> + * <code>RESULT_RIL_REQUEST_RATE_LIMITED</code><br> + * <code>RESULT_RIL_INVALID_SMS_FORMAT</code><br> + * <code>RESULT_RIL_SYSTEM_ERR</code><br> + * <code>RESULT_RIL_ENCODING_ERR</code><br> + * <code>RESULT_RIL_INVALID_SMSC_ADDRESS</code><br> + * <code>RESULT_RIL_MODEM_ERR</code><br> + * <code>RESULT_RIL_NETWORK_ERR</code><br> + * <code>RESULT_RIL_INTERNAL_ERR</code><br> + * <code>RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br> + * <code>RESULT_RIL_INVALID_MODEM_STATE</code><br> + * <code>RESULT_RIL_NETWORK_NOT_READY</code><br> + * <code>RESULT_RIL_OPERATION_NOT_ALLOWED</code><br> + * <code>RESULT_RIL_NO_RESOURCES</code><br> + * <code>RESULT_RIL_CANCELLED</code><br> + * <code>RESULT_RIL_SIM_ABSENT</code><br> + * For <code>RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors, + * the sentIntent may include the extra "errorCode" containing a radio technology specific + * value, generally only useful for troubleshooting.<br> * The per-application based SMS control checks sentIntent. If sentIntent * is NULL the caller will be checked against all unknown applications, * which cause smaller number of SMS to be sent in checking period. @@ -1094,12 +1342,12 @@ public final class SmsManager { sentIntent, deliveryIntent); } catch (RemoteException e) { Log.e(TAG, "sendDataMessage: Couldn't send SMS - Exception: " + e.getMessage()); - notifySmsGenericError(sentIntent); + notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION); } } @Override public void onFailure() { - notifySmsErrorNoDefaultSet(context, sentIntent); + notifySmsError(sentIntent, RESULT_NO_DEFAULT_SMS_APP); } }); } @@ -1304,53 +1552,20 @@ public final class SmsManager { return binder; } - private static void notifySmsErrorNoDefaultSet(Context context, PendingIntent pendingIntent) { - if (pendingIntent != null) { - Intent errorMessage = new Intent(); - errorMessage.putExtra(NO_DEFAULT_EXTRA, true); - try { - pendingIntent.send(context, RESULT_ERROR_GENERIC_FAILURE, errorMessage); - } catch (PendingIntent.CanceledException e) { - // Don't worry about it, we do not need to notify the caller if this is the case. - } - } - } - - private static void notifySmsErrorNoDefaultSet(Context context, - List<PendingIntent> pendingIntents) { - if (pendingIntents != null) { - for (PendingIntent pendingIntent : pendingIntents) { - Intent errorMessage = new Intent(); - errorMessage.putExtra(NO_DEFAULT_EXTRA, true); - try { - pendingIntent.send(context, RESULT_ERROR_GENERIC_FAILURE, errorMessage); - } catch (PendingIntent.CanceledException e) { - // Don't worry about it, we do not need to notify the caller if this is the - // case. - } - } - } - } - - private static void notifySmsGenericError(PendingIntent pendingIntent) { + private static void notifySmsError(PendingIntent pendingIntent, int error) { if (pendingIntent != null) { try { - pendingIntent.send(RESULT_ERROR_GENERIC_FAILURE); + pendingIntent.send(error); } catch (PendingIntent.CanceledException e) { // Don't worry about it, we do not need to notify the caller if this is the case. } } } - private static void notifySmsGenericError(List<PendingIntent> pendingIntents) { + private static void notifySmsError(List<PendingIntent> pendingIntents, int error) { if (pendingIntents != null) { for (PendingIntent pendingIntent : pendingIntents) { - try { - pendingIntent.send(RESULT_ERROR_GENERIC_FAILURE); - } catch (PendingIntent.CanceledException e) { - // Don't worry about it, we do not need to notify the caller if this is the - // case. - } + notifySmsError(pendingIntent, error); } } } @@ -1797,19 +2012,19 @@ public final class SmsManager { // see SmsMessage.getStatusOnIcc /** Free space (TS 51.011 10.5.3 / 3GPP2 C.S0023 3.4.27). */ - static public final int STATUS_ON_ICC_FREE = 0; + public static final int STATUS_ON_ICC_FREE = 0; /** Received and read (TS 51.011 10.5.3 / 3GPP2 C.S0023 3.4.27). */ - static public final int STATUS_ON_ICC_READ = 1; + public static final int STATUS_ON_ICC_READ = 1; /** Received and unread (TS 51.011 10.5.3 / 3GPP2 C.S0023 3.4.27). */ - static public final int STATUS_ON_ICC_UNREAD = 3; + public static final int STATUS_ON_ICC_UNREAD = 3; /** Stored and sent (TS 51.011 10.5.3 / 3GPP2 C.S0023 3.4.27). */ - static public final int STATUS_ON_ICC_SENT = 5; + public static final int STATUS_ON_ICC_SENT = 5; /** Stored and unsent (TS 51.011 10.5.3 / 3GPP2 C.S0023 3.4.27). */ - static public final int STATUS_ON_ICC_UNSENT = 7; + public static final int STATUS_ON_ICC_UNSENT = 7; // SMS send failure result codes @@ -1845,126 +2060,263 @@ public final class SmsManager { /** * No error. - * @hide */ - @SystemApi - static public final int RESULT_ERROR_NONE = 0; + public static final int RESULT_ERROR_NONE = 0; + /** Generic failure cause */ - static public final int RESULT_ERROR_GENERIC_FAILURE = 1; + public static final int RESULT_ERROR_GENERIC_FAILURE = 1; + /** Failed because radio was explicitly turned off */ - static public final int RESULT_ERROR_RADIO_OFF = 2; + public static final int RESULT_ERROR_RADIO_OFF = 2; + /** Failed because no pdu provided */ - static public final int RESULT_ERROR_NULL_PDU = 3; + public static final int RESULT_ERROR_NULL_PDU = 3; + /** Failed because service is currently unavailable */ - static public final int RESULT_ERROR_NO_SERVICE = 4; + public static final int RESULT_ERROR_NO_SERVICE = 4; + /** Failed because we reached the sending queue limit. */ - static public final int RESULT_ERROR_LIMIT_EXCEEDED = 5; + public static final int RESULT_ERROR_LIMIT_EXCEEDED = 5; + /** * Failed because FDN is enabled. - * @hide */ - @SystemApi - static public final int RESULT_ERROR_FDN_CHECK_FAILURE = 6; + public static final int RESULT_ERROR_FDN_CHECK_FAILURE = 6; + /** Failed because user denied the sending of this short code. */ - static public final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7; + public static final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7; + /** Failed because the user has denied this app ever send premium short codes. */ - static public final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8; + public static final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8; + /** * Failed because the radio was not available - * @hide */ - @SystemApi - static public final int RESULT_RADIO_NOT_AVAILABLE = 9; + public static final int RESULT_RADIO_NOT_AVAILABLE = 9; + /** * Failed because of network rejection - * @hide */ - @SystemApi - static public final int RESULT_NETWORK_REJECT = 10; + public static final int RESULT_NETWORK_REJECT = 10; + /** * Failed because of invalid arguments - * @hide */ - @SystemApi - static public final int RESULT_INVALID_ARGUMENTS = 11; + public static final int RESULT_INVALID_ARGUMENTS = 11; + /** * Failed because of an invalid state - * @hide */ - @SystemApi - static public final int RESULT_INVALID_STATE = 12; + public static final int RESULT_INVALID_STATE = 12; + /** * Failed because there is no memory - * @hide */ - @SystemApi - static public final int RESULT_NO_MEMORY = 13; + public static final int RESULT_NO_MEMORY = 13; + /** * Failed because the sms format is not valid - * @hide */ - @SystemApi - static public final int RESULT_INVALID_SMS_FORMAT = 14; + public static final int RESULT_INVALID_SMS_FORMAT = 14; + /** * Failed because of a system error - * @hide */ - @SystemApi - static public final int RESULT_SYSTEM_ERROR = 15; + public static final int RESULT_SYSTEM_ERROR = 15; + /** * Failed because of a modem error - * @hide */ - @SystemApi - static public final int RESULT_MODEM_ERROR = 16; + public static final int RESULT_MODEM_ERROR = 16; + /** * Failed because of a network error - * @hide */ - @SystemApi - static public final int RESULT_NETWORK_ERROR = 17; + public static final int RESULT_NETWORK_ERROR = 17; + /** * Failed because of an encoding error - * @hide */ - @SystemApi - static public final int RESULT_ENCODING_ERROR = 18; + public static final int RESULT_ENCODING_ERROR = 18; + /** * Failed because of an invalid smsc address - * @hide */ - @SystemApi - static public final int RESULT_INVALID_SMSC_ADDRESS = 19; + public static final int RESULT_INVALID_SMSC_ADDRESS = 19; + /** * Failed because the operation is not allowed - * @hide */ - @SystemApi - static public final int RESULT_OPERATION_NOT_ALLOWED = 20; + public static final int RESULT_OPERATION_NOT_ALLOWED = 20; + /** * Failed because of an internal error - * @hide */ - @SystemApi - static public final int RESULT_INTERNAL_ERROR = 21; + public static final int RESULT_INTERNAL_ERROR = 21; + /** * Failed because there are no resources - * @hide */ - @SystemApi - static public final int RESULT_NO_RESOURCES = 22; + public static final int RESULT_NO_RESOURCES = 22; + /** * Failed because the operation was cancelled - * @hide */ - @SystemApi - static public final int RESULT_CANCELLED = 23; + public static final int RESULT_CANCELLED = 23; + /** * Failed because the request is not supported - * @hide */ - @SystemApi - static public final int RESULT_REQUEST_NOT_SUPPORTED = 24; + public static final int RESULT_REQUEST_NOT_SUPPORTED = 24; + + /** + * Failed sending via bluetooth because the bluetooth service is not available + */ + public static final int RESULT_NO_BLUETOOTH_SERVICE = 25; + + /** + * Failed sending via bluetooth because the bluetooth device address is invalid + */ + public static final int RESULT_INVALID_BLUETOOTH_ADDRESS = 26; + + /** + * Failed sending via bluetooth because bluetooth disconnected + */ + public static final int RESULT_BLUETOOTH_DISCONNECTED = 27; + + /** + * Failed sending because the user denied or canceled the dialog displayed for a premium + * shortcode sms or rate-limited sms. + */ + public static final int RESULT_UNEXPECTED_EVENT_STOP_SENDING = 28; + + /** + * Failed sending during an emergency call + */ + public static final int RESULT_SMS_BLOCKED_DURING_EMERGENCY = 29; + + /** + * Failed to send an sms retry + */ + public static final int RESULT_SMS_SEND_RETRY_FAILED = 30; + + /** + * Set by BroadcastReceiver to indicate a remote exception while handling a message. + */ + public static final int RESULT_REMOTE_EXCEPTION = 31; + + /** + * Set by BroadcastReceiver to indicate there's no default sms app. + */ + public static final int RESULT_NO_DEFAULT_SMS_APP = 32; + + // Radio Error results + + /** + * The radio did not start or is resetting. + */ + public static final int RESULT_RIL_RADIO_NOT_AVAILABLE = 100; + + /** + * The radio failed to send the sms and needs to retry. + */ + public static final int RESULT_RIL_SMS_SEND_FAIL_RETRY = 101; + + /** + * The sms request was rejected by the network. + */ + public static final int RESULT_RIL_NETWORK_REJECT = 102; + + /** + * The radio returned an unexpected request for the current state. + */ + public static final int RESULT_RIL_INVALID_STATE = 103; + + /** + * The radio received invalid arguments in the request. + */ + public static final int RESULT_RIL_INVALID_ARGUMENTS = 104; + + /** + * The radio didn't have sufficient memory to process the request. + */ + public static final int RESULT_RIL_NO_MEMORY = 105; + + /** + * The radio denied the operation due to overly-frequent requests. + */ + public static final int RESULT_RIL_REQUEST_RATE_LIMITED = 106; + + /** + * The radio returned an error indicating invalid sms format. + */ + public static final int RESULT_RIL_INVALID_SMS_FORMAT = 107; + + /** + * The radio encountered a platform or system error. + */ + public static final int RESULT_RIL_SYSTEM_ERR = 108; + + /** + * The SMS message was not encoded properly. + */ + public static final int RESULT_RIL_ENCODING_ERR = 109; + + /** + * The specified SMSC address was invalid. + */ + public static final int RESULT_RIL_INVALID_SMSC_ADDRESS = 110; + + /** + * The vendor RIL received an unexpected or incorrect response. + */ + public static final int RESULT_RIL_MODEM_ERR = 111; + + /** + * The radio received an error from the network. + */ + public static final int RESULT_RIL_NETWORK_ERR = 112; + + /** + * The modem encountered an unexpected error scenario while handling the request. + */ + public static final int RESULT_RIL_INTERNAL_ERR = 113; + + /** + * The request was not supported by the radio. + */ + public static final int RESULT_RIL_REQUEST_NOT_SUPPORTED = 114; + + /** + * The radio cannot process the request in the current modem state. + */ + public static final int RESULT_RIL_INVALID_MODEM_STATE = 115; + + /** + * The network is not ready to perform the request. + */ + public static final int RESULT_RIL_NETWORK_NOT_READY = 116; + + /** + * The radio reports the request is not allowed. + */ + public static final int RESULT_RIL_OPERATION_NOT_ALLOWED = 117; + + /** + * There are not sufficient resources to process the request. + */ + public static final int RESULT_RIL_NO_RESOURCES = 118; + + /** + * The request has been cancelled. + */ + public static final int RESULT_RIL_CANCELLED = 119; + + /** + * The radio failed to set the location where the CDMA subscription + * can be retrieved because the SIM or RUIM is absent. + */ + public static final int RESULT_RIL_SIM_ABSENT = 120; /** * Send an MMS message diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 33882337edb2..21a89f49fa62 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -31,6 +31,7 @@ import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SuppressAutoDoc; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; import android.app.BroadcastOptions; import android.app.PendingIntent; @@ -1868,13 +1869,27 @@ public class SubscriptionManager { return subId; } - /** @hide */ - public void setDefaultVoiceSubId(int subId) { - if (VDBG) logd("setDefaultVoiceSubId sub id = " + subId); + /** + * Sets the system's default voice subscription id. + * + * On a data-only device, this is a no-op. + * + * May throw a {@link RuntimeException} if the provided subscription id is equal to + * {@link SubscriptionManager#DEFAULT_SUBSCRIPTION_ID} + * + * @param subscriptionId A valid subscription ID to set as the system default, or + * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID} + * @hide + */ + @SystemApi + @TestApi + @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) + public void setDefaultVoiceSubscriptionId(int subscriptionId) { + if (VDBG) logd("setDefaultVoiceSubId sub id = " + subscriptionId); try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - iSub.setDefaultVoiceSubId(subId); + iSub.setDefaultVoiceSubId(subscriptionId); } } catch (RemoteException ex) { // ignore it @@ -1882,6 +1897,15 @@ public class SubscriptionManager { } /** + * Same as {@link #setDefaultVoiceSubscriptionId(int)}, but preserved for backwards + * compatibility. + * @hide + */ + public void setDefaultVoiceSubId(int subId) { + setDefaultVoiceSubscriptionId(subId); + } + + /** * Return the SubscriptionInfo for default voice subscription. * * Will return null on data only devices, or on error. @@ -2101,13 +2125,13 @@ public class SubscriptionManager { /** @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static boolean isValidSlotIndex(int slotIndex) { - return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getSupportedModemCount(); + return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getActiveModemCount(); } /** @hide */ @UnsupportedAppUsage public static boolean isValidPhoneId(int phoneId) { - return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getSupportedModemCount(); + return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getActiveModemCount(); } /** @hide */ @@ -2964,6 +2988,7 @@ public class SubscriptionManager { * permission or had carrier privilege permission on the subscription. * {@link TelephonyManager#hasCarrierPrivileges()} * + * @throws IllegalStateException if Telephony service is in bad state. * @throws SecurityException if the caller doesn't meet the requirements * outlined above. * diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0abed24ce16c..6708b1da35eb 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -38,6 +38,7 @@ import android.annotation.UnsupportedAppUsage; import android.annotation.WorkerThread; import android.app.ActivityThread; import android.app.PendingIntent; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; @@ -70,7 +71,6 @@ import android.telephony.Annotation.NetworkType; import android.telephony.Annotation.RadioPowerState; import android.telephony.Annotation.SimActivationState; import android.telephony.VisualVoicemailService.VisualVoicemailTask; -import android.telephony.data.ApnSetting; import android.telephony.emergency.EmergencyNumber; import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories; import android.telephony.ims.ImsMmTelManager; @@ -98,6 +98,7 @@ import com.android.internal.telephony.IUpdateAvailableNetworksCallback; import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.RILConstants; +import com.android.internal.telephony.SmsApplication; import com.android.internal.telephony.TelephonyProperties; import dalvik.system.VMRuntime; @@ -272,6 +273,8 @@ public class TelephonyManager { * TSTS - Triple SIM Triple Standby **/ /** @hide */ + @UnsupportedAppUsage(implicitMember = + "values()[Landroid/telephony/TelephonyManager$MultiSimVariants;") public enum MultiSimVariants { @UnsupportedAppUsage DSDS, @@ -430,6 +433,25 @@ public class TelephonyManager { getActiveModemCount()); } + /** + * Gets the maximum number of SIMs that can be active, based on the device's multisim + * configuration. + * @return 1 for single-SIM, DSDS, and TSTS devices. 2 for DSDA devices. + * @hide + */ + @SystemApi + public int getMaxNumberOfSimultaneouslyActiveSims() { + switch (getMultiSimConfiguration()) { + case UNKNOWN: + case DSDS: + case TSTS: + return 1; + case DSDA: + return 2; + } + return 1; + } + /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public static TelephonyManager from(Context context) { @@ -1650,8 +1672,8 @@ public class TelephonyManager { * * <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier - * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a - * managed profile on the device; for more details see <a + * privileges (see {@link #hasCarrierPrivileges}) on any active subscription. The profile owner + * is an app that owns a managed profile on the device; for more details see <a * href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner * access is deprecated and will be removed in a future release. * @@ -1691,8 +1713,8 @@ public class TelephonyManager { * * <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier - * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a - * managed profile on the device; for more details see <a + * privileges (see {@link #hasCarrierPrivileges}) on any active subscription. The profile owner + * is an app that owns a managed profile on the device; for more details see <a * href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner * access is deprecated and will be removed in a future release. * @@ -1751,7 +1773,8 @@ public class TelephonyManager { * <li>The caller holds the READ_PRIVILEGED_PHONE_STATE permission.</li> * <li>If the caller is the device or profile owner, the caller holds the * {@link Manifest.permission#READ_PHONE_STATE} permission.</li> - * <li>The caller has carrier privileges (see {@link #hasCarrierPrivileges()}.</li> + * <li>The caller has carrier privileges (see {@link #hasCarrierPrivileges()} on any + * active subscription.</li> * <li>The caller is the default SMS app for the device.</li> * </ul> * <p>The profile owner is an app that owns a managed profile on the device; for more details @@ -1820,8 +1843,8 @@ public class TelephonyManager { * * <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier - * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a - * managed profile on the device; for more details see <a + * privileges (see {@link #hasCarrierPrivileges}) on any active subscription. The profile owner + * is an app that owns a managed profile on the device; for more details see <a * href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner * access is deprecated and will be removed in a future release. * @@ -1847,8 +1870,8 @@ public class TelephonyManager { * * <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier - * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a - * managed profile on the device; for more details see <a + * privileges (see {@link #hasCarrierPrivileges}) on any active subscription. The profile owner + * is an app that owns a managed profile on the device; for more details see <a * href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner * access is deprecated and will be removed in a future release. * @@ -5494,19 +5517,20 @@ public class TelephonyManager { telephony.requestCellInfoUpdate( getSubId(), new ICellInfoCallback.Stub() { + @Override public void onCellInfo(List<CellInfo> cellInfo) { Binder.withCleanCallingIdentity(() -> executor.execute(() -> callback.onCellInfo(cellInfo))); } - public void onError(int errorCode, android.os.ParcelableException detail) { + @Override + public void onError(int errorCode, String exceptionName, String message) { Binder.withCleanCallingIdentity(() -> executor.execute(() -> callback.onError( errorCode, - detail == null ? null : detail.getCause()))); + createThrowableByClassName(exceptionName, message)))); } }, getOpPackageName()); - } catch (RemoteException ex) { } } @@ -5535,22 +5559,36 @@ public class TelephonyManager { telephony.requestCellInfoUpdateWithWorkSource( getSubId(), new ICellInfoCallback.Stub() { + @Override public void onCellInfo(List<CellInfo> cellInfo) { Binder.withCleanCallingIdentity(() -> executor.execute(() -> callback.onCellInfo(cellInfo))); } - public void onError(int errorCode, android.os.ParcelableException detail) { + @Override + public void onError(int errorCode, String exceptionName, String message) { Binder.withCleanCallingIdentity(() -> executor.execute(() -> callback.onError( errorCode, - detail == null ? null : detail.getCause()))); + createThrowableByClassName(exceptionName, message)))); } }, getOpPackageName(), workSource); } catch (RemoteException ex) { } } + private static Throwable createThrowableByClassName(String className, String message) { + if (className == null) { + return null; + } + try { + Class<?> c = Class.forName(className); + return (Throwable) c.getConstructor(String.class).newInstance(message); + } catch (ReflectiveOperationException | ClassCastException e) { + } + return new RuntimeException(className + ": " + message); + } + /** * Sets the minimum time in milli-seconds between {@link PhoneStateListener#onCellInfoChanged * PhoneStateListener.onCellInfoChanged} will be invoked. @@ -9274,6 +9312,21 @@ public class TelephonyManager { } /** + * Gets the default Respond Via Message application + * @param context context from the calling app + * @param updateIfNeeded update the default app if there is no valid default app configured. + * @return component name of the app and class to direct Respond Via Message intent to, or + * {@code null} if the functionality is not supported. + * @hide + */ + @SystemApi + @TestApi + public static @Nullable ComponentName getDefaultRespondViaMessageApplication( + @NonNull Context context, boolean updateIfNeeded) { + return SmsApplication.getDefaultRespondViaMessageApplication(context, updateIfNeeded); + } + + /** * Set the alphabetic name of current registered operator. * @param name the alphabetic name of current registered operator. * @hide @@ -9375,7 +9428,7 @@ public class TelephonyManager { * @hide */ @UnsupportedAppUsage - public int getSubIdForPhoneAccount(PhoneAccount phoneAccount) { + public int getSubIdForPhoneAccount(@Nullable PhoneAccount phoneAccount) { int retval = SubscriptionManager.INVALID_SUBSCRIPTION_ID; try { ITelephony service = getITelephony(); @@ -9435,18 +9488,37 @@ public class TelephonyManager { } /** - * Resets Telephony and IMS settings back to factory defaults. + * Resets telephony manager settings back to factory defaults. * * @hide */ - @SystemApi - @RequiresPermission(Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset(int subId) { try { Log.d(TAG, "factoryReset: subId=" + subId); ITelephony telephony = getITelephony(); - if (telephony != null) + if (telephony != null) { telephony.factoryReset(subId); + } + } catch (RemoteException e) { + } + } + + + /** + * Resets Telephony and IMS settings back to factory defaults only for the subscription + * associated with this instance. + * @see #createForSubscriptionId(int) + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.CONNECTIVITY_INTERNAL) + public void resetSettings() { + try { + Log.d(TAG, "resetSettings: subId=" + getSubId()); + ITelephony telephony = getITelephony(); + if (telephony != null) { + telephony.factoryReset(getSubId()); + } } catch (RemoteException e) { } } diff --git a/telephony/java/android/telephony/cdma/CdmaSmsCbProgramData.aidl b/telephony/java/android/telephony/cdma/CdmaSmsCbProgramData.aidl new file mode 100644 index 000000000000..a648a0e81073 --- /dev/null +++ b/telephony/java/android/telephony/cdma/CdmaSmsCbProgramData.aidl @@ -0,0 +1,21 @@ +/* + * 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. + */ + +/** @hide */ +package android.telephony.cdma; + +parcelable CdmaSmsCbProgramData; + diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index a5d62669de05..60774e7f1e7f 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -1944,8 +1944,9 @@ public class ApnSetting implements Parcelable { * {@link ApnSetting} built from this builder otherwise. */ public ApnSetting build() { - if ((mApnTypeBitmask & TYPE_ALL) == 0 || TextUtils.isEmpty(mApnName) - || TextUtils.isEmpty(mEntryName)) { + if ((mApnTypeBitmask & (TYPE_DEFAULT | TYPE_MMS | TYPE_SUPL | TYPE_DUN | TYPE_HIPRI | + TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX)) == 0 + || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) { return null; } return new ApnSetting(this); diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index 77ee20512d11..4ddeb908a200 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -309,6 +309,37 @@ public final class ImsCallProfile implements Parcelable { public @CallRestrictCause int mRestrictCause = CALL_RESTRICT_CAUSE_NONE; /** + * The VERSTAT for an incoming call's phone number. + */ + private @VerificationStatus int mCallerNumberVerificationStatus; + + /** + * Indicates that the network could not perform verification. + */ + public static final int VERIFICATION_STATUS_NOT_VERIFIED = 0; + + /** + * Indicates that verification by the network passed. This indicates there is a high likelihood + * that the call originated from a valid source. + */ + public static final int VERIFICATION_STATUS_PASSED = 1; + + /** + * Indicates that verification by the network failed. This indicates there is a high likelihood + * that the call did not originate from a valid source. + */ + public static final int VERIFICATION_STATUS_FAILED = 2; + + /**@hide*/ + @Retention(RetentionPolicy.SOURCE) + @IntDef(prefix = "VERIFICATION_STATUS_", value = { + VERIFICATION_STATUS_NOT_VERIFIED, + VERIFICATION_STATUS_PASSED, + VERIFICATION_STATUS_FAILED + }) + public @interface VerificationStatus {} + + /** * The emergency service categories, only valid if {@link #getServiceType} returns * {@link #SERVICE_TYPE_EMERGENCY} * @@ -539,6 +570,29 @@ public final class ImsCallProfile implements Parcelable { mMediaProfile = profile.mMediaProfile; } + /** + * Sets the verification status for the phone number of an incoming call as identified in + * ATIS-1000082. + * <p> + * The ImsService should parse the verstat information from the SIP INVITE headers for the call + * to determine this information. It is typically found in the P-Asserted-Identity OR From + * header fields. + * @param callerNumberVerificationStatus the new verification status. + */ + public void setCallerNumberVerificationStatus( + @VerificationStatus int callerNumberVerificationStatus) { + mCallerNumberVerificationStatus = callerNumberVerificationStatus; + } + + /** + * Gets the verification status for the phone number of an incoming call as identified in + * ATIS-1000082. + * @return the verification status. + */ + public @VerificationStatus int getCallerNumberVerificationStatus() { + return mCallerNumberVerificationStatus; + } + @NonNull @Override public String toString() { @@ -551,7 +605,8 @@ public final class ImsCallProfile implements Parcelable { + ", emergencyCallRouting=" + mEmergencyCallRouting + ", emergencyCallTesting=" + mEmergencyCallTesting + ", hasKnownUserIntentEmergency=" + mHasKnownUserIntentEmergency - + ", mRestrictCause=" + mRestrictCause + " }"; + + ", mRestrictCause=" + mRestrictCause + + ", mCallerNumberVerstat= " + mCallerNumberVerificationStatus + " }"; } @Override @@ -572,6 +627,7 @@ public final class ImsCallProfile implements Parcelable { out.writeBoolean(mEmergencyCallTesting); out.writeBoolean(mHasKnownUserIntentEmergency); out.writeInt(mRestrictCause); + out.writeInt(mCallerNumberVerificationStatus); } private void readFromParcel(Parcel in) { @@ -585,6 +641,7 @@ public final class ImsCallProfile implements Parcelable { mEmergencyCallTesting = in.readBoolean(); mHasKnownUserIntentEmergency = in.readBoolean(); mRestrictCause = in.readInt(); + mCallerNumberVerificationStatus = in.readInt(); } public static final @android.annotation.NonNull Creator<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() { diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java index 7cafa1ea068c..9fc8e7563a81 100644 --- a/telephony/java/android/telephony/ims/ImsMmTelManager.java +++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java @@ -254,8 +254,8 @@ public class ImsMmTelManager implements RegistrationManager { * the {@link ImsService} associated with the subscription is not available. This can happen if * the service crashed, for example. See {@link ImsException#getCode()} for a more detailed * reason. - * @deprecated Use {@link #registerImsRegistrationCallback( - * RegistrationManager.RegistrationCallback, Executor)} instead. + * @deprecated Use {@link RegistrationManager#registerImsRegistrationCallback(Executor, + * RegistrationManager.RegistrationCallback)} instead. */ @Deprecated @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @@ -285,9 +285,8 @@ public class ImsMmTelManager implements RegistrationManager { /**{@inheritDoc}*/ @Override @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - public void registerImsRegistrationCallback( - @NonNull RegistrationManager.RegistrationCallback c, - @NonNull @CallbackExecutor Executor executor) throws ImsException { + public void registerImsRegistrationCallback(@NonNull @CallbackExecutor Executor executor, + @NonNull RegistrationManager.RegistrationCallback c) throws ImsException { if (c == null) { throw new IllegalArgumentException("Must include a non-null RegistrationCallback."); } @@ -348,8 +347,8 @@ public class ImsMmTelManager implements RegistrationManager { /**{@inheritDoc}*/ @Override @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - public void getRegistrationState(@NonNull @ImsRegistrationState Consumer<Integer> stateCallback, - @NonNull @CallbackExecutor Executor executor) { + public void getRegistrationState(@NonNull @CallbackExecutor Executor executor, + @NonNull @ImsRegistrationState Consumer<Integer> stateCallback) { if (stateCallback == null) { throw new IllegalArgumentException("Must include a non-null callback."); } @@ -371,9 +370,9 @@ public class ImsMmTelManager implements RegistrationManager { /**{@inheritDoc}*/ @Override @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - public void getRegistrationTransportType( - @NonNull @AccessNetworkConstants.TransportType Consumer<Integer> transportTypeCallback, - @NonNull @CallbackExecutor Executor executor) { + public void getRegistrationTransportType(@NonNull @CallbackExecutor Executor executor, + @NonNull @AccessNetworkConstants.TransportType + Consumer<Integer> transportTypeCallback) { if (transportTypeCallback == null) { throw new IllegalArgumentException("Must include a non-null callback."); } @@ -607,17 +606,17 @@ public class ImsMmTelManager implements RegistrationManager { * {@link CarrierConfigManager#ACTION_CARRIER_CONFIG_CHANGED} broadcast for this subscription. * @param capability The capability that is being queried for support on the carrier network. * @param transportType The transport type of the capability to check support for. + * @param executor The executor that the callback will be called with. * @param callback A consumer containing a Boolean result specifying whether or not the * capability is supported on this carrier network for the transport specified. - * @param executor The executor that the callback will be called with. * @throws ImsException if the subscription is no longer valid or the IMS service is not * available. */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void isSupported(@MmTelFeature.MmTelCapabilities.MmTelCapability int capability, @AccessNetworkConstants.TransportType int transportType, - @NonNull Consumer<Boolean> callback, - @NonNull @CallbackExecutor Executor executor) throws ImsException { + @NonNull @CallbackExecutor Executor executor, + @NonNull Consumer<Boolean> callback) throws ImsException { if (callback == null) { throw new IllegalArgumentException("Must include a non-null Consumer."); } diff --git a/telephony/java/android/telephony/ims/ImsRcsManager.java b/telephony/java/android/telephony/ims/ImsRcsManager.java index 25bd1caea431..21707b0d7cfd 100644 --- a/telephony/java/android/telephony/ims/ImsRcsManager.java +++ b/telephony/java/android/telephony/ims/ImsRcsManager.java @@ -22,11 +22,15 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.content.Context; import android.os.Binder; +import android.os.IBinder; +import android.os.RemoteException; +import android.os.ServiceManager; import android.telephony.AccessNetworkConstants; -import android.telephony.SubscriptionManager; import android.telephony.ims.aidl.IImsCapabilityCallback; +import android.telephony.ims.aidl.IImsRcsController; import android.telephony.ims.feature.ImsFeature; import android.telephony.ims.feature.RcsFeature; +import android.util.Log; import java.util.concurrent.Executor; import java.util.function.Consumer; @@ -35,10 +39,11 @@ import java.util.function.Consumer; * Manager for interfacing with the framework RCS services, including the User Capability Exchange * (UCE) service, as well as managing user settings. * - * Use {@link #createForSubscriptionId(Context, int)} to create an instance of this manager. + * Use {@link ImsManager#getImsRcsManager(int)} to create an instance of this manager. * @hide */ public class ImsRcsManager implements RegistrationManager { + private static final String TAG = "ImsRcsManager"; /** * Receives RCS availability status updates from the ImsService. @@ -112,37 +117,30 @@ public class ImsRcsManager implements RegistrationManager { private final int mSubId; private final Context mContext; - /** - * Create an instance of ImsRcsManager for the subscription id specified. - * - * @param context The context to create this ImsRcsManager instance within. - * @param subscriptionId The ID of the subscription that this ImsRcsManager will use. - * @see android.telephony.SubscriptionManager#getActiveSubscriptionInfoList() - * @throws IllegalArgumentException if the subscription is invalid. + * Use {@link ImsManager#getImsRcsManager(int)} to create an instance of this class. * @hide */ - public static ImsRcsManager createForSubscriptionId(Context context, int subscriptionId) { - if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) { - throw new IllegalArgumentException("Invalid subscription ID"); - } - - return new ImsRcsManager(context, subscriptionId); + public ImsRcsManager(Context context, int subId) { + mSubId = subId; + mContext = context; } /** - * Use {@link #createForSubscriptionId(Context, int)} to create an instance of this class. + * @return A {@link RcsUceAdapter} used for User Capability Exchange (UCE) operations for + * this subscription. + * @hide */ - private ImsRcsManager(Context context, int subId) { - mContext = context; - mSubId = subId; + @NonNull + public RcsUceAdapter getUceAdapter() { + return new RcsUceAdapter(mSubId); } /**{@inheritDoc}*/ @Override public void registerImsRegistrationCallback( - @NonNull RegistrationManager.RegistrationCallback c, - @NonNull @CallbackExecutor Executor executor) + @NonNull @CallbackExecutor Executor executor, + @NonNull RegistrationCallback c) throws ImsException { if (c == null) { throw new IllegalArgumentException("Must include a non-null RegistrationCallback."); @@ -168,8 +166,8 @@ public class ImsRcsManager implements RegistrationManager { /**{@inheritDoc}*/ @Override - public void getRegistrationState(@NonNull @ImsRegistrationState Consumer<Integer> stateCallback, - @NonNull @CallbackExecutor Executor executor) { + public void getRegistrationState(@NonNull @CallbackExecutor Executor executor, + @NonNull @ImsRegistrationState Consumer<Integer> stateCallback) { if (stateCallback == null) { throw new IllegalArgumentException("Must include a non-null stateCallback."); } @@ -182,9 +180,9 @@ public class ImsRcsManager implements RegistrationManager { /**{@inheritDoc}*/ @Override - public void getRegistrationTransportType( - @NonNull @AccessNetworkConstants.TransportType Consumer<Integer> transportTypeCallback, - @NonNull @CallbackExecutor Executor executor) { + public void getRegistrationTransportType(@NonNull @CallbackExecutor Executor executor, + @NonNull @AccessNetworkConstants.TransportType + Consumer<Integer> transportTypeCallback) { if (transportTypeCallback == null) { throw new IllegalArgumentException("Must include a non-null transportTypeCallback."); } @@ -225,9 +223,22 @@ public class ImsRcsManager implements RegistrationManager { if (executor == null) { throw new IllegalArgumentException("Must include a non-null Executor."); } + + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "Register availability callback: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + c.setExecutor(executor); - throw new UnsupportedOperationException("registerRcsAvailabilityCallback is not" - + "supported."); + try { + imsRcsController.registerRcsAvailabilityCallback(c.getBinder()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#registerRcsAvailabilityCallback", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } } /** @@ -238,14 +249,31 @@ public class ImsRcsManager implements RegistrationManager { * inactive subscription, it will result in a no-op. * @param c The RCS {@link AvailabilityCallback} to be removed. * @see #registerRcsAvailabilityCallback(Executor, AvailabilityCallback) + * @throws ImsException if the IMS service is not available when calling this method + * {@link ImsRcsController#unregisterRcsAvailabilityCallback()}. + * See {@link ImsException#getCode()} for more information on the error codes. */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - public void unregisterRcsAvailabilityCallback(@NonNull AvailabilityCallback c) { + public void unregisterRcsAvailabilityCallback(@NonNull AvailabilityCallback c) + throws ImsException { if (c == null) { throw new IllegalArgumentException("Must include a non-null AvailabilityCallback."); } - throw new UnsupportedOperationException("unregisterRcsAvailabilityCallback is not" - + "supported."); + + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "Unregister availability callback: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + + try { + imsRcsController.unregisterRcsAvailabilityCallback(c.getBinder()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#unregisterRcsAvailabilityCallback", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } } /** @@ -260,10 +288,27 @@ public class ImsRcsManager implements RegistrationManager { * rather the subscription is capable of this service over IMS. * @see #isAvailable(int) * @see android.telephony.CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL + * @throws ImsException if the IMS service is not available when calling this method + * {@link ImsRcsController#isCapable(int, int)}. + * See {@link ImsException#getCode()} for more information on the error codes. */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - public boolean isCapable(@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability) { - throw new UnsupportedOperationException("isCapable is not supported."); + public boolean isCapable(@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability) + throws ImsException { + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "isCapable: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + + try { + return imsRcsController.isCapable(mSubId, capability); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#isCapable", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } } /** @@ -277,18 +322,31 @@ public class ImsRcsManager implements RegistrationManager { * false otherwise. If the capability is available, IMS is registered and the service is * currently available over IMS. * @see #isCapable(int) + * @throws ImsException if the IMS service is not available when calling this method + * {@link ImsRcsController#isAvailable(int, int)}. + * See {@link ImsException#getCode()} for more information on the error codes. */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - public boolean isAvailable(@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability) { - throw new UnsupportedOperationException("isAvailable is not supported."); + public boolean isAvailable(@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability) + throws ImsException { + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "isAvailable: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + + try { + return imsRcsController.isAvailable(mSubId, capability); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#isAvailable", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } } - /** - * @return A new {@link RcsUceAdapter} used for User Capability Exchange (UCE) operations for - * this subscription. - */ - @NonNull - public RcsUceAdapter getUceAdapter() { - return new RcsUceAdapter(mSubId); + private IImsRcsController getIImsRcsController() { + IBinder binder = ServiceManager.getService(Context.TELEPHONY_IMS_SERVICE); + return IImsRcsController.Stub.asInterface(binder); } } diff --git a/telephony/java/android/telephony/ims/RcsUceAdapter.java b/telephony/java/android/telephony/ims/RcsUceAdapter.java index a6a7a84c2c65..b47bcb9b119b 100644 --- a/telephony/java/android/telephony/ims/RcsUceAdapter.java +++ b/telephony/java/android/telephony/ims/RcsUceAdapter.java @@ -23,6 +23,13 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.content.Context; import android.net.Uri; +import android.os.Binder; +import android.os.IBinder; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.telephony.ims.aidl.IImsRcsController; +import android.telephony.ims.aidl.IRcsUceControllerCallback; +import android.util.Log; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -36,6 +43,7 @@ import java.util.concurrent.Executor; * @hide */ public class RcsUceAdapter { + private static final String TAG = "RcsUceAdapter"; /** * An unknown error has caused the request to fail. @@ -188,7 +196,6 @@ public class RcsUceAdapter { /** * Not to be instantiated directly, use - * {@link ImsRcsManager#createForSubscriptionId(Context, int)} and * {@link ImsRcsManager#getUceAdapter()} to instantiate this manager class. */ RcsUceAdapter(int subId) { @@ -218,7 +225,45 @@ public class RcsUceAdapter { public void requestCapabilities(@CallbackExecutor Executor executor, @NonNull List<Uri> contactNumbers, @NonNull CapabilitiesCallback c) throws ImsException { - throw new UnsupportedOperationException("isUceSettingEnabled is not supported."); + if (c == null) { + throw new IllegalArgumentException("Must include a non-null AvailabilityCallback."); + } + if (executor == null) { + throw new IllegalArgumentException("Must include a non-null Executor."); + } + if (contactNumbers == null) { + throw new IllegalArgumentException("Must include non-null contact number list."); + } + + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "requestCapabilities: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + + IRcsUceControllerCallback internalCallback = new IRcsUceControllerCallback.Stub() { + @Override + public void onCapabilitiesReceived(List<RcsContactUceCapability> contactCapabilities) { + Binder.withCleanCallingIdentity(() -> + executor.execute(() -> + c.onCapabilitiesReceived(contactCapabilities))); + } + @Override + public void onError(int errorCode) { + Binder.withCleanCallingIdentity(() -> + executor.execute(() -> + c.onError(errorCode))); + } + }; + + try { + imsRcsController.requestCapabilities(mSubId, contactNumbers, internalCallback); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#requestCapabilities", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } } /** @@ -233,7 +278,20 @@ public class RcsUceAdapter { */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public @PublishState int getUcePublishState() throws ImsException { - throw new UnsupportedOperationException("getPublishState is not supported."); + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "getUcePublishState: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + + try { + return imsRcsController.getUcePublishState(mSubId); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#getUcePublishState", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } } /** @@ -252,9 +310,22 @@ public class RcsUceAdapter { */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isUceSettingEnabled() throws ImsException { - // TODO: add SubscriptionController column for this property. - throw new UnsupportedOperationException("isUceSettingEnabled is not supported."); + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "isUceSettingEnabled: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + + try { + return imsRcsController.isUceSettingEnabled(mSubId); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#isUceSettingEnabled", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } } + /** * Change the user’s setting for whether or not UCE is enabled for the associated subscription. * @param isEnabled the user's setting for whether or not they wish for Presence and User @@ -270,7 +341,24 @@ public class RcsUceAdapter { */ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean isEnabled) throws ImsException { - // TODO: add SubscriptionController column for this property. - throw new UnsupportedOperationException("setUceSettingEnabled is not supported."); + IImsRcsController imsRcsController = getIImsRcsController(); + if (imsRcsController == null) { + Log.e(TAG, "setUceSettingEnabled: IImsRcsController is null"); + throw new ImsException("Can not find remote IMS service", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + + try { + imsRcsController.setUceSettingEnabled(mSubId, isEnabled); + } catch (RemoteException e) { + Log.e(TAG, "Error calling IImsRcsController#setUceSettingEnabled", e); + throw new ImsException("Remote IMS Service is not available", + ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); + } + } + + private IImsRcsController getIImsRcsController() { + IBinder binder = ServiceManager.getService(Context.TELEPHONY_IMS_SERVICE); + return IImsRcsController.Stub.asInterface(binder); } } diff --git a/telephony/java/android/telephony/ims/RegistrationManager.java b/telephony/java/android/telephony/ims/RegistrationManager.java index b4c11e3c32a1..23402b88f3b1 100644 --- a/telephony/java/android/telephony/ims/RegistrationManager.java +++ b/telephony/java/android/telephony/ims/RegistrationManager.java @@ -90,7 +90,7 @@ public interface RegistrationManager { /** * Callback class for receiving IMS network Registration callback events. - * @see #registerImsRegistrationCallback(RegistrationCallback, Executor) + * @see #registerImsRegistrationCallback(Executor, RegistrationCallback) * @see #unregisterImsRegistrationCallback(RegistrationCallback) */ class RegistrationCallback { @@ -229,8 +229,8 @@ public interface RegistrationManager { * When the callback is registered, it will initiate the callback c to be called with the * current registration state. * - * @param c The {@link RegistrationCallback} to be added. * @param executor The executor the callback events should be run on. + * @param c The {@link RegistrationCallback} to be added. * @see #unregisterImsRegistrationCallback(RegistrationCallback) * @throws ImsException if the subscription associated with this callback is valid, but * the {@link ImsService} associated with the subscription is not available. This can happen if @@ -238,8 +238,8 @@ public interface RegistrationManager { * reason. */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - void registerImsRegistrationCallback(@NonNull RegistrationCallback c, - @NonNull @CallbackExecutor Executor executor) throws ImsException; + void registerImsRegistrationCallback(@NonNull @CallbackExecutor Executor executor, + @NonNull RegistrationCallback c) throws ImsException; /** * Removes an existing {@link RegistrationCallback}. @@ -250,36 +250,36 @@ public interface RegistrationManager { * * @param c The {@link RegistrationCallback} to be removed. * @see SubscriptionManager.OnSubscriptionsChangedListener - * @see #registerImsRegistrationCallback(RegistrationCallback, Executor) + * @see #registerImsRegistrationCallback(Executor, RegistrationCallback) */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) void unregisterImsRegistrationCallback(@NonNull RegistrationCallback c); /** * Gets the registration state of the IMS service. - * @param stateCallback A callback called on the supplied {@link Executor} that will contain the - * registration state of the IMS service, which will be one of the - * following: {@link #REGISTRATION_STATE_NOT_REGISTERED}, - * {@link #REGISTRATION_STATE_REGISTERING}, or - * {@link #REGISTRATION_STATE_REGISTERED}. * @param executor The {@link Executor} that will be used to call the IMS registration state * callback. + * @param stateCallback A callback called on the supplied {@link Executor} that will contain the + * registration state of the IMS service, which will be one of the + * following: {@link #REGISTRATION_STATE_NOT_REGISTERED}, + * {@link #REGISTRATION_STATE_REGISTERING}, or + * {@link #REGISTRATION_STATE_REGISTERED}. */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - void getRegistrationState(@NonNull @ImsRegistrationState Consumer<Integer> stateCallback, - @NonNull @CallbackExecutor Executor executor); + void getRegistrationState(@NonNull @CallbackExecutor Executor executor, + @NonNull @ImsRegistrationState Consumer<Integer> stateCallback); /** * Gets the Transport Type associated with the current IMS registration. - * @param transportTypeCallback The transport type associated with the current IMS registration, - * which will be one of following: - * {@link AccessNetworkConstants#TRANSPORT_TYPE_WWAN}, - * {@link AccessNetworkConstants#TRANSPORT_TYPE_WLAN}, or - * {@link AccessNetworkConstants#TRANSPORT_TYPE_INVALID}. * @param executor The {@link Executor} that will be used to call the transportTypeCallback. + * @param transportTypeCallback The transport type associated with the current IMS registration, + * which will be one of following: + * {@link AccessNetworkConstants#TRANSPORT_TYPE_WWAN}, + * {@link AccessNetworkConstants#TRANSPORT_TYPE_WLAN}, or + * {@link AccessNetworkConstants#TRANSPORT_TYPE_INVALID}. */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) void getRegistrationTransportType( - @NonNull @AccessNetworkConstants.TransportType Consumer<Integer> transportTypeCallback, - @NonNull @CallbackExecutor Executor executor); + @NonNull @CallbackExecutor Executor executor, + @NonNull @AccessNetworkConstants.TransportType Consumer<Integer> transportTypeCallback); } diff --git a/telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl b/telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl new file mode 100644 index 000000000000..b379bd0cd748 --- /dev/null +++ b/telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.telephony.ims.aidl; + +import android.net.Uri; +import android.telephony.ims.aidl.IImsCapabilityCallback; +import android.telephony.ims.aidl.IRcsUceControllerCallback; + +/** + * Interface used to interact with the Telephony IMS. + * + * {@hide} + */ +interface IImsRcsController { + void registerRcsAvailabilityCallback(IImsCapabilityCallback c); + void unregisterRcsAvailabilityCallback(IImsCapabilityCallback c); + boolean isCapable(int subId, int capability); + boolean isAvailable(int subId, int capability); + + // ImsUceAdapter specific + void requestCapabilities(int subId, in List<Uri> contactNumbers, IRcsUceControllerCallback c); + int getUcePublishState(int subId); + boolean isUceSettingEnabled(int subId); + void setUceSettingEnabled(int subId, boolean isEnabled); +} diff --git a/telephony/java/android/telephony/ims/aidl/IRcsUceControllerCallback.aidl b/telephony/java/android/telephony/ims/aidl/IRcsUceControllerCallback.aidl new file mode 100644 index 000000000000..5975930d5cfa --- /dev/null +++ b/telephony/java/android/telephony/ims/aidl/IRcsUceControllerCallback.aidl @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.telephony.ims.aidl; + +import android.telephony.ims.RcsContactUceCapability; + +/** + * Provides interface for RCS UCE when receive a change. + * + * {@hide} + */ +oneway interface IRcsUceControllerCallback { + void onCapabilitiesReceived(in List<RcsContactUceCapability> contactCapabilities); + void onError(int errorCode); +} diff --git a/telephony/java/android/telephony/ims/compat/ImsService.java b/telephony/java/android/telephony/ims/compat/ImsService.java index 2750e51fc3d4..97a8517afea9 100644 --- a/telephony/java/android/telephony/ims/compat/ImsService.java +++ b/telephony/java/android/telephony/ims/compat/ImsService.java @@ -113,6 +113,10 @@ public class ImsService extends Service { } }; + @UnsupportedAppUsage + public ImsService() { + } + /** * @hide */ diff --git a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java index 40ea208e4578..3fd356a510e6 100644 --- a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java @@ -16,12 +16,16 @@ package android.telephony.ims.compat.feature; +import android.annotation.UnsupportedAppUsage; import android.app.PendingIntent; import android.os.Message; import android.os.RemoteException; - -import android.annotation.UnsupportedAppUsage; import android.telephony.ims.ImsCallProfile; +import android.telephony.ims.ImsCallSession; +import android.telephony.ims.stub.ImsEcbmImplBase; +import android.telephony.ims.stub.ImsMultiEndpointImplBase; +import android.telephony.ims.stub.ImsUtImplBase; + import com.android.ims.internal.IImsCallSession; import com.android.ims.internal.IImsCallSessionListener; import com.android.ims.internal.IImsConfig; @@ -30,11 +34,6 @@ import com.android.ims.internal.IImsMMTelFeature; import com.android.ims.internal.IImsMultiEndpoint; import com.android.ims.internal.IImsRegistrationListener; import com.android.ims.internal.IImsUt; -import android.telephony.ims.ImsCallSession; -import android.telephony.ims.compat.stub.ImsCallSessionImplBase; -import android.telephony.ims.stub.ImsEcbmImplBase; -import android.telephony.ims.stub.ImsMultiEndpointImplBase; -import android.telephony.ims.stub.ImsUtImplBase; /** * Base implementation for MMTel. @@ -49,6 +48,10 @@ public class MMTelFeature extends ImsFeature { // Lock for feature synchronization private final Object mLock = new Object(); + @UnsupportedAppUsage + public MMTelFeature() { + } + private final IImsMMTelFeature mImsMMTelBinder = new IImsMMTelFeature.Stub() { @Override diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java index 38566fe6d811..d77f78ea9e88 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java @@ -16,6 +16,7 @@ package android.telephony.ims.compat.stub; +import android.annotation.UnsupportedAppUsage; import android.os.Message; import android.os.RemoteException; import android.telephony.CallQuality; @@ -41,6 +42,10 @@ import com.android.ims.internal.IImsVideoCallProvider; public class ImsCallSessionImplBase extends IImsCallSession.Stub { + @UnsupportedAppUsage + public ImsCallSessionImplBase() { + } + @Override // convert to old implementation of listener public final void setListener(IImsCallSessionListener listener) diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java index ae113f2f46c8..e2024742c058 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java @@ -16,6 +16,7 @@ package android.telephony.ims.compat.stub; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.os.RemoteException; import android.telephony.ims.ImsCallForwardInfo; @@ -39,6 +40,10 @@ import com.android.ims.internal.IImsUtListener; public class ImsUtListenerImplBase extends IImsUtListener.Stub { + @UnsupportedAppUsage + public ImsUtListenerImplBase() { + } + /** * Notifies the result of the supplementary service configuration udpate. */ diff --git a/telephony/java/com/android/ims/ImsUtInterface.java b/telephony/java/com/android/ims/ImsUtInterface.java index c9d440551631..e80087d8924e 100644 --- a/telephony/java/com/android/ims/ImsUtInterface.java +++ b/telephony/java/com/android/ims/ImsUtInterface.java @@ -21,6 +21,8 @@ import android.os.Message; import android.telephony.ims.ImsCallForwardInfo; import android.telephony.ims.ImsSsInfo; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * Provides APIs for the supplementary service settings using IMS (Ut interface). * It is created from 3GPP TS 24.623 (XCAP(XML Configuration Access Protocol) @@ -121,6 +123,7 @@ public interface ImsUtInterface { * Retrieves the configuration of the call forward. * The return value of ((AsyncResult)result.obj) is an array of {@link ImsCallForwardInfo}. */ + @UnsupportedAppUsage public void queryCallForward(int condition, String number, Message result); /** diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index cde6db4888fa..e1113eba006f 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -17,6 +17,8 @@ package com.android.internal.telephony; import com.android.internal.util.Protocol; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * @hide */ @@ -37,20 +39,34 @@ public class DctConstants { * RETRYING or CONNECTING: CONNECTING * CONNECTED : CONNECTED or DISCONNECTING */ + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/android/internal/telephony/DctConstants$State;") public enum State { + @UnsupportedAppUsage IDLE, + @UnsupportedAppUsage CONNECTING, + @UnsupportedAppUsage RETRYING, + @UnsupportedAppUsage CONNECTED, + @UnsupportedAppUsage DISCONNECTING, + @UnsupportedAppUsage FAILED, } + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/android/internal/telephony/DctConstants$Activity;") public enum Activity { NONE, + @UnsupportedAppUsage DATAIN, + @UnsupportedAppUsage DATAOUT, + @UnsupportedAppUsage DATAINANDOUT, + @UnsupportedAppUsage DORMANT } diff --git a/telephony/java/com/android/internal/telephony/GsmAlphabet.java b/telephony/java/com/android/internal/telephony/GsmAlphabet.java index a75096f2c082..79d366037f08 100644 --- a/telephony/java/com/android/internal/telephony/GsmAlphabet.java +++ b/telephony/java/com/android/internal/telephony/GsmAlphabet.java @@ -16,19 +16,17 @@ package com.android.internal.telephony; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; +import android.os.Build; +import android.telephony.Rlog; import android.text.TextUtils; import android.util.SparseIntArray; -import android.annotation.UnsupportedAppUsage; -import android.os.Build; -import android.telephony.Rlog; +import com.android.internal.R; import java.nio.ByteBuffer; import java.nio.charset.Charset; -import com.android.internal.telephony.SmsConstants; -import com.android.internal.R; - import java.util.ArrayList; import java.util.List; @@ -42,8 +40,6 @@ import java.util.List; public class GsmAlphabet { private static final String TAG = "GSM"; - private GsmAlphabet() { } - /** * This escapes extended characters, and when present indicates that the * following character should be looked up in the "extended" table. @@ -83,6 +79,11 @@ public class GsmAlphabet { * data. */ public static class TextEncodingDetails { + + @UnsupportedAppUsage + public TextEncodingDetails() { + } + /** *The number of SMS's required to encode the text. */ diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 414693ef6362..39a216d468b9 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -319,6 +319,7 @@ interface ITelephony { /** * Replaced by getDataActivityForSubId. */ + @UnsupportedAppUsage(maxTargetSdk = 28) int getDataActivity(); /** @@ -336,6 +337,7 @@ interface ITelephony { /** * Replaced by getDataStateForSubId. */ + @UnsupportedAppUsage(maxTargetSdk = 28) int getDataState(); /** diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 21b2f3939568..d7a7af1d530f 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -49,8 +49,10 @@ interface ITelephonyRegistry { void notifySignalStrengthForPhoneId(in int phoneId, in int subId, in SignalStrength signalStrength); void notifyMessageWaitingChangedForPhoneId(in int phoneId, in int subId, in boolean mwi); + @UnsupportedAppUsage(maxTargetSdk = 28) void notifyCallForwardingChanged(boolean cfi); void notifyCallForwardingChangedForSubscriber(in int subId, boolean cfi); + @UnsupportedAppUsage(maxTargetSdk = 28) void notifyDataActivity(int state); void notifyDataActivityForSubscriber(in int subId, int state); void notifyDataConnection(int state, boolean isDataConnectivityPossible, @@ -63,8 +65,10 @@ interface ITelephonyRegistry { @UnsupportedAppUsage void notifyDataConnectionFailed(String apnType); void notifyDataConnectionFailedForSubscriber(int phoneId, int subId, String apnType); + @UnsupportedAppUsage(maxTargetSdk = 28) void notifyCellLocation(in Bundle cellLocation); void notifyCellLocationForSubscriber(in int subId, in Bundle cellLocation); + @UnsupportedAppUsage(maxTargetSdk = 28) void notifyOtaspChanged(in int subId, in int otaspMode); @UnsupportedAppUsage void notifyCellInfo(in List<CellInfo> cellInfo); diff --git a/telephony/java/com/android/internal/telephony/IccCardConstants.java b/telephony/java/com/android/internal/telephony/IccCardConstants.java index d57f9afa01e9..6ff27b1152c8 100644 --- a/telephony/java/com/android/internal/telephony/IccCardConstants.java +++ b/telephony/java/com/android/internal/telephony/IccCardConstants.java @@ -17,6 +17,8 @@ package com.android.internal.telephony; import android.telephony.TelephonyManager; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * {@hide} */ @@ -65,15 +67,26 @@ public class IccCardConstants { * * The ordinal values much match {@link TelephonyManager#SIM_STATE_UNKNOWN} ... */ + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/android/internal/telephony/IccCardConstants$State;") public enum State { + @UnsupportedAppUsage UNKNOWN, /** ordinal(0) == {@See TelephonyManager#SIM_STATE_UNKNOWN} */ + @UnsupportedAppUsage ABSENT, /** ordinal(1) == {@See TelephonyManager#SIM_STATE_ABSENT} */ + @UnsupportedAppUsage PIN_REQUIRED, /** ordinal(2) == {@See TelephonyManager#SIM_STATE_PIN_REQUIRED} */ + @UnsupportedAppUsage PUK_REQUIRED, /** ordinal(3) == {@See TelephonyManager#SIM_STATE_PUK_REQUIRED} */ + @UnsupportedAppUsage NETWORK_LOCKED, /** ordinal(4) == {@See TelephonyManager#SIM_STATE_NETWORK_LOCKED} */ + @UnsupportedAppUsage READY, /** ordinal(5) == {@See TelephonyManager#SIM_STATE_READY} */ + @UnsupportedAppUsage NOT_READY, /** ordinal(6) == {@See TelephonyManager#SIM_STATE_NOT_READY} */ + @UnsupportedAppUsage PERM_DISABLED, /** ordinal(7) == {@See TelephonyManager#SIM_STATE_PERM_DISABLED} */ + @UnsupportedAppUsage CARD_IO_ERROR, /** ordinal(8) == {@See TelephonyManager#SIM_STATE_CARD_IO_ERROR} */ CARD_RESTRICTED,/** ordinal(9) == {@See TelephonyManager#SIM_STATE_CARD_RESTRICTED} */ LOADED; /** ordinal(9) == {@See TelephonyManager#SIM_STATE_LOADED} */ diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index 5b2f6880819a..e4397cdf1254 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -15,6 +15,8 @@ */ package com.android.internal.telephony; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * @hide */ @@ -31,8 +33,15 @@ public class PhoneConstants { * ringing or waiting.</li> * </ul> */ + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/android/internal/telephony/PhoneConstants$State;") public enum State { - IDLE, RINGING, OFFHOOK; + @UnsupportedAppUsage + IDLE, + @UnsupportedAppUsage + RINGING, + @UnsupportedAppUsage + OFFHOOK; }; /** @@ -46,8 +55,17 @@ public class PhoneConstants { * in 2G network</li> * </ul> */ + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/android/internal/telephony/PhoneConstants$DataState;") public enum DataState { - CONNECTED, CONNECTING, DISCONNECTED, SUSPENDED; + @UnsupportedAppUsage + CONNECTED, + @UnsupportedAppUsage + CONNECTING, + @UnsupportedAppUsage + DISCONNECTED, + @UnsupportedAppUsage + SUSPENDED; }; public static final String STATE_KEY = "state"; @@ -69,9 +87,13 @@ public class PhoneConstants { public static final int LTE_ON_CDMA_TRUE = RILConstants.LTE_ON_CDMA_TRUE; // Number presentation type for caller id display (From internal/Connection.java) + @UnsupportedAppUsage public static final int PRESENTATION_ALLOWED = 1; // normal + @UnsupportedAppUsage public static final int PRESENTATION_RESTRICTED = 2; // block by user + @UnsupportedAppUsage public static final int PRESENTATION_UNKNOWN = 3; // no specified or unknown by network + @UnsupportedAppUsage public static final int PRESENTATION_PAYPHONE = 4; // show pay phone info public static final String PHONE_NAME_KEY = "phoneName"; diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 5205973669ac..03ea9208d064 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -18,6 +18,8 @@ package com.android.internal.telephony; import android.telephony.TelephonyManager; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * {@hide} */ @@ -230,6 +232,7 @@ public interface RILConstants { /** NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA */ int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33; + @UnsupportedAppUsage int PREFERRED_NETWORK_MODE = Integer.parseInt(TelephonyManager.getTelephonyProperty(0, "ro.telephony.default_network", Integer.toString(NETWORK_MODE_WCDMA_PREF))); diff --git a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java index 49c737fc3440..2cdf2f63e02f 100644 --- a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java +++ b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java @@ -16,27 +16,28 @@ package com.android.internal.telephony; -import android.telephony.Rlog; -import android.os.Build; -import android.util.SparseIntArray; import android.content.res.Resources; import android.content.res.XmlResourceParser; -import android.telephony.SmsManager; -import android.telephony.TelephonyManager; +import android.os.Build; +import android.telephony.Rlog; +import android.util.SparseIntArray; -import com.android.internal.util.XmlUtils; import com.android.internal.telephony.cdma.sms.UserData; +import com.android.internal.util.XmlUtils; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; +import dalvik.annotation.compat.UnsupportedAppUsage; public class Sms7BitEncodingTranslator { private static final String TAG = "Sms7BitEncodingTranslator"; + @UnsupportedAppUsage private static final boolean DBG = Build.IS_DEBUGGABLE ; private static boolean mIs7BitTranslationTableLoaded = false; private static SparseIntArray mTranslationTable = null; + @UnsupportedAppUsage private static SparseIntArray mTranslationTableCommon = null; + @UnsupportedAppUsage private static SparseIntArray mTranslationTableGSM = null; + @UnsupportedAppUsage private static SparseIntArray mTranslationTableCDMA = null; // Parser variables diff --git a/telephony/java/com/android/internal/telephony/SmsHeader.java b/telephony/java/com/android/internal/telephony/SmsHeader.java index 9fe1718df6b6..dd77b0179487 100644 --- a/telephony/java/com/android/internal/telephony/SmsHeader.java +++ b/telephony/java/com/android/internal/telephony/SmsHeader.java @@ -16,13 +16,12 @@ package com.android.internal.telephony; -import com.android.internal.telephony.SmsConstants; +import android.annotation.UnsupportedAppUsage; + import com.android.internal.util.HexDump; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; - -import android.annotation.UnsupportedAppUsage; import java.util.ArrayList; /** @@ -74,6 +73,10 @@ public class SmsHeader { public static class PortAddrs { @UnsupportedAppUsage + public PortAddrs() { + } + + @UnsupportedAppUsage public int destPort; @UnsupportedAppUsage public int origPort; @@ -82,6 +85,10 @@ public class SmsHeader { public static class ConcatRef { @UnsupportedAppUsage + public ConcatRef() { + } + + @UnsupportedAppUsage public int refNumber; @UnsupportedAppUsage public int seqNumber; diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java index ffdc4b676f90..d29ef3560883 100644 --- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java +++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java @@ -16,23 +16,27 @@ package com.android.internal.telephony; -import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; -import com.android.internal.telephony.SmsConstants; -import com.android.internal.telephony.SmsHeader; -import java.text.BreakIterator; -import java.util.Arrays; - import android.annotation.UnsupportedAppUsage; import android.os.Build; import android.provider.Telephony; import android.telephony.SmsMessage; import android.text.Emoji; +import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; + +import java.text.BreakIterator; +import java.util.Arrays; + /** * Base class declaring the specific methods and members for SmsMessage. * {@hide} */ public abstract class SmsMessageBase { + + @UnsupportedAppUsage + public SmsMessageBase() { + } + /** {@hide} The address of the SMSC. May be null */ @UnsupportedAppUsage protected String mScAddress; diff --git a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java index 67103bfddce1..8a852eea5610 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java @@ -237,9 +237,10 @@ public final class TelephonyPermissions { * <ul> * <li>return true: if the caller has the READ_PRIVILEGED_PHONE_STATE permission, the calling * package passes a DevicePolicyManager Device Owner / Profile Owner device identifier - * access check, or the calling package has carrier privileges. - * <li>throw SecurityException: if the caller does not meet any of the requirements and is - * targeting Q or is targeting pre-Q and does not have the READ_PHONE_STATE permission. + * access check, or the calling package has carrier privileges on any active subscription. + * <li>throw SecurityException: if the caller does not meet any of the requirements and is + * targeting Q or is targeting pre-Q and does not have the READ_PHONE_STATE permission + * or carrier privileges of any active subscription. * <li>return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE * permission. In this case the caller would expect to have access to the device * identifiers so false is returned instead of throwing a SecurityException to indicate @@ -259,10 +260,10 @@ public final class TelephonyPermissions { * <ul> * <li>return true: if the caller has the READ_PRIVILEGED_PHONE_STATE permission, the calling * package passes a DevicePolicyManager Device Owner / Profile Owner device identifier - * access check, or the calling package has carrier privileges. + * access check, or the calling package has carrier privileges on any active subscription. * <li>throw SecurityException: if the caller does not meet any of the requirements and is * targeting Q or is targeting pre-Q and does not have the READ_PHONE_STATE permission - * or carrier privileges. + * or carrier privileges of any active subscription. * <li>return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE * permission or carrier privileges. In this case the caller would expect to have access * to the device identifiers so false is returned instead of throwing a SecurityException @@ -271,8 +272,8 @@ public final class TelephonyPermissions { */ public static boolean checkCallingOrSelfReadDeviceIdentifiers(Context context, int subId, String callingPackage, String message) { - return checkReadDeviceIdentifiers(context, TELEPHONY_SUPPLIER, subId, - Binder.getCallingPid(), Binder.getCallingUid(), callingPackage, message); + return checkPrivilegedReadPermissionOrCarrierPrivilegePermission( + context, subId, callingPackage, message, true); } /** @@ -282,7 +283,7 @@ public final class TelephonyPermissions { * <ul> * <li>return true: if the caller has the READ_PRIVILEGED_PHONE_STATE permission, the calling * package passes a DevicePolicyManager Device Owner / Profile Owner device identifier - * access check, or the calling package has carrier privileges. + * access check, or the calling package has carrier privileges on specified subscription. * <li>throw SecurityException: if the caller does not meet any of the requirements and is * targeting Q or is targeting pre-Q and does not have the READ_PHONE_STATE permission. * <li>return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE @@ -293,21 +294,33 @@ public final class TelephonyPermissions { */ public static boolean checkCallingOrSelfReadSubscriberIdentifiers(Context context, int subId, String callingPackage, String message) { - return checkReadDeviceIdentifiers(context, TELEPHONY_SUPPLIER, subId, - Binder.getCallingPid(), Binder.getCallingUid(), callingPackage, message); + return checkPrivilegedReadPermissionOrCarrierPrivilegePermission( + context, subId, callingPackage, message, false); } /** * Checks whether the app with the given pid/uid can read device identifiers. * - * @returns true if the caller has the READ_PRIVILEGED_PHONE_STATE permission or the calling - * package passes a DevicePolicyManager Device Owner / Profile Owner device identifier access - * check. + * <p>This method behaves in one of the following ways: + * <ul> + * <li>return true: if the caller has the READ_PRIVILEGED_PHONE_STATE permission, the calling + * package passes a DevicePolicyManager Device Owner / Profile Owner device identifier + * access check; or the calling package has carrier privileges on the specified + * subscription; or allowCarrierPrivilegeOnAnySub is true and has carrier privilege on + * any active subscription. + * <li>throw SecurityException: if the caller does not meet any of the requirements and is + * targeting Q or is targeting pre-Q and does not have the READ_PHONE_STATE permission. + * <li>return false: if the caller is targeting pre-Q and does have the READ_PHONE_STATE + * permission. In this case the caller would expect to have access to the device + * identifiers so false is returned instead of throwing a SecurityException to indicate + * the calling function should return dummy data. + * </ul> */ - @VisibleForTesting - public static boolean checkReadDeviceIdentifiers(Context context, - Supplier<ITelephony> telephonySupplier, int subId, int pid, int uid, - String callingPackage, String message) { + private static boolean checkPrivilegedReadPermissionOrCarrierPrivilegePermission( + Context context, int subId, String callingPackage, String message, + boolean allowCarrierPrivilegeOnAnySub) { + int uid = Binder.getCallingUid(); + int pid = Binder.getCallingPid(); // Allow system and root access to the device identifiers. final int appId = UserHandle.getAppId(uid); if (appId == Process.SYSTEM_UID || appId == Process.ROOT_UID) { @@ -318,10 +331,17 @@ public final class TelephonyPermissions { uid) == PackageManager.PERMISSION_GRANTED) { return true; } - // If the calling package has carrier privileges for any subscription then allow access. - if (checkCarrierPrivilegeForAnySubId(context, telephonySupplier, uid)) { + + // If the calling package has carrier privileges for specified sub, then allow access. + if (checkCarrierPrivilegeForSubId(subId)) return true; + + // If the calling package has carrier privileges for any subscription + // and allowCarrierPrivilegeOnAnySub is set true, then allow access. + if (allowCarrierPrivilegeOnAnySub && checkCarrierPrivilegeForAnySubId( + context, TELEPHONY_SUPPLIER, uid)) { return true; } + // if the calling package is not null then perform the DevicePolicyManager device / // profile owner and Appop checks. if (callingPackage != null) { @@ -347,7 +367,7 @@ public final class TelephonyPermissions { } } return reportAccessDeniedToReadIdentifiers(context, subId, pid, uid, callingPackage, - message); + message); } /** diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java index bf5c0a18cc96..4e42c20d28db 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java +++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java @@ -16,6 +16,8 @@ package com.android.internal.telephony; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * Contains a list of string constants used to get or set telephone properties * in the system. You can use {@link android.os.SystemProperties os.SystemProperties} @@ -101,6 +103,7 @@ public interface TelephonyProperties * provider of the SIM. 5 or 6 decimal digits. * Availability: SIM state must be "READY" */ + @UnsupportedAppUsage static String PROPERTY_ICC_OPERATOR_NUMERIC = "gsm.sim.operator.numeric"; /** PROPERTY_ICC_OPERATOR_ALPHA is also known as the SPN, or Service Provider Name. diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index 152387596adc..b357fa43008f 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -44,6 +44,8 @@ import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.util.BitwiseInputStream; import com.android.internal.util.HexDump; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -108,7 +110,9 @@ public class SmsMessage extends SmsMessageBase { private static final int PRIORITY_URGENT = 0x2; private static final int PRIORITY_EMERGENCY = 0x3; + @UnsupportedAppUsage private SmsEnvelope mEnvelope; + @UnsupportedAppUsage private BearerData mBearerData; /** @hide */ @@ -118,15 +122,20 @@ public class SmsMessage extends SmsMessageBase { createPdu(); } + @UnsupportedAppUsage public SmsMessage() {} public static class SubmitPdu extends SubmitPduBase { + @UnsupportedAppUsage + public SubmitPdu() { + } } /** * Create an SmsMessage from a raw PDU. * Note: In CDMA the PDU is just a byte representation of the received Sms. */ + @UnsupportedAppUsage public static SmsMessage createFromPdu(byte[] pdu) { SmsMessage msg = new SmsMessage(); @@ -152,6 +161,7 @@ public class SmsMessage extends SmsMessageBase { * * @hide */ + @UnsupportedAppUsage public static SmsMessage createFromEfRecord(int index, byte[] data) { try { SmsMessage msg = new SmsMessage(); @@ -218,6 +228,7 @@ public class SmsMessage extends SmsMessageBase { * Returns null on encode error. * @hide */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddr, String destAddr, String message, boolean statusReportRequested, SmsHeader smsHeader) { return getSubmitPdu(scAddr, destAddr, message, statusReportRequested, smsHeader, -1); @@ -238,6 +249,7 @@ public class SmsMessage extends SmsMessageBase { * Returns null on encode error. * @hide */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddr, String destAddr, String message, boolean statusReportRequested, SmsHeader smsHeader, int priority) { @@ -268,6 +280,7 @@ public class SmsMessage extends SmsMessageBase { * address, if applicable, and the encoded message. * Returns null on encode error. */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddr, String destAddr, int destPort, byte[] data, boolean statusReportRequested) { @@ -305,6 +318,7 @@ public class SmsMessage extends SmsMessageBase { * address, if applicable, and the encoded message. * Returns null on encode error. */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String destAddr, UserData userData, boolean statusReportRequested) { return privateGetSubmitPdu(destAddr, statusReportRequested, userData); @@ -321,6 +335,7 @@ public class SmsMessage extends SmsMessageBase { * address, if applicable, and the encoded message. * Returns null on encode error. */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String destAddr, UserData userData, boolean statusReportRequested, int priority) { return privateGetSubmitPdu(destAddr, statusReportRequested, userData, priority); @@ -392,6 +407,7 @@ public class SmsMessage extends SmsMessageBase { } /** Return true iff the bearer data message type is DELIVERY_ACK. */ + @UnsupportedAppUsage @Override public boolean isStatusReportMessage() { return (mBearerData.messageType == BearerData.MESSAGE_TYPE_DELIVERY_ACK); @@ -414,6 +430,7 @@ public class SmsMessage extends SmsMessageBase { * @param isEntireMsg indicates if this is entire msg or a segment in multipart msg * @return TextEncodingDetails */ + @UnsupportedAppUsage public static TextEncodingDetails calculateLength(CharSequence messageBody, boolean use7bitOnly, boolean isEntireMsg) { CharSequence newMsgBody = null; @@ -436,6 +453,7 @@ public class SmsMessage extends SmsMessageBase { * {@link com.android.internal.telephony.cdma.sms.SmsEnvelope#TELESERVICE_VMN}, * {@link com.android.internal.telephony.cdma.sms.SmsEnvelope#TELESERVICE_WAP} */ + @UnsupportedAppUsage public int getTeleService() { return mEnvelope.teleService; } @@ -447,6 +465,7 @@ public class SmsMessage extends SmsMessageBase { * {@link com.android.internal.telephony.cdma.sms.SmsEnvelope#MESSAGE_TYPE_BROADCAST}, * {@link com.android.internal.telephony.cdma.sms.SmsEnvelope#MESSAGE_TYPE_ACKNOWLEDGE}, */ + @UnsupportedAppUsage public int getMessageType() { // NOTE: mEnvelope.messageType is not set correctly for cell broadcasts with some RILs. // Use the service category parameter to detect CMAS and other cell broadcast messages. @@ -762,6 +781,7 @@ public class SmsMessage extends SmsMessageBase { /** * Parses a SMS message from its BearerData stream. */ + @UnsupportedAppUsage public void parseSms() { // Message Waiting Info Record defined in 3GPP2 C.S-0005, 3.7.5.6 // It contains only an 8-bit number with the number of messages waiting @@ -913,6 +933,7 @@ public class SmsMessage extends SmsMessageBase { * binder-call, and hence should be thread-safe, it has been * synchronized. */ + @UnsupportedAppUsage public synchronized static int getNextMessageId() { // Testing and dialog with partners has indicated that // msgId==0 is (sometimes?) treated specially by lower levels. @@ -937,6 +958,7 @@ public class SmsMessage extends SmsMessageBase { * Creates BearerData and Envelope from parameters for a Submit SMS. * @return byte stream for SubmitPdu. */ + @UnsupportedAppUsage private static SubmitPdu privateGetSubmitPdu(String destAddrStr, boolean statusReportRequested, UserData userData) { return privateGetSubmitPdu(destAddrStr, statusReportRequested, userData, -1); @@ -1122,6 +1144,7 @@ public class SmsMessage extends SmsMessageBase { /** This function shall be called to get the number of voicemails. * @hide */ + @UnsupportedAppUsage public int getNumOfVoicemails() { return mBearerData.numberOfMessages; } @@ -1133,6 +1156,7 @@ public class SmsMessage extends SmsMessageBase { * @return byte array uniquely identifying the message. * @hide */ + @UnsupportedAppUsage public byte[] getIncomingSmsFingerprint() { ByteArrayOutputStream output = new ByteArrayOutputStream(); diff --git a/telephony/java/com/android/internal/telephony/cdma/UserData.java b/telephony/java/com/android/internal/telephony/cdma/UserData.java index f87956098e5c..d960f05f3114 100644 --- a/telephony/java/com/android/internal/telephony/cdma/UserData.java +++ b/telephony/java/com/android/internal/telephony/cdma/UserData.java @@ -21,8 +21,14 @@ import android.util.SparseIntArray; import com.android.internal.telephony.SmsHeader; import com.android.internal.util.HexDump; +import dalvik.annotation.compat.UnsupportedAppUsage; + public class UserData { + @UnsupportedAppUsage + public UserData() { + } + /** * User data encoding types. * (See 3GPP2 C.R1001-F, v1.0, table 9.1-1) @@ -92,6 +98,7 @@ public class UserData { public static final int PRINTABLE_ASCII_MIN_INDEX = 0x20; public static final int ASCII_NL_INDEX = 0x0A; public static final int ASCII_CR_INDEX = 0x0D; + @UnsupportedAppUsage public static final SparseIntArray charToAscii = new SparseIntArray(); static { for (int i = 0; i < ASCII_MAP.length; i++) { @@ -131,12 +138,15 @@ public class UserData { /** * Contains the data header of the user data */ + @UnsupportedAppUsage public SmsHeader userDataHeader; /** * Contains the data encoding type for the SMS message */ + @UnsupportedAppUsage public int msgEncoding; + @UnsupportedAppUsage public boolean msgEncodingSet = false; public int msgType; @@ -146,13 +156,16 @@ public class UserData { */ public int paddingBits; + @UnsupportedAppUsage public int numFields; /** * Contains the user data of a SMS message * (See 3GPP2 C.S0015-B, v2, 4.5.2) */ + @UnsupportedAppUsage public byte[] payload; + @UnsupportedAppUsage public String payloadStr; @Override diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index dab14369d79c..e9378e7ba690 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -17,10 +17,10 @@ package com.android.internal.telephony.cdma.sms; import android.content.res.Resources; +import android.telephony.Rlog; import android.telephony.SmsCbCmasInfo; import android.telephony.cdma.CdmaSmsCbProgramData; import android.telephony.cdma.CdmaSmsCbProgramResults; -import android.telephony.Rlog; import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; @@ -31,6 +31,8 @@ import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.util.BitwiseInputStream; import com.android.internal.util.BitwiseOutputStream; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -42,6 +44,10 @@ import java.util.ArrayList; public final class BearerData { private final static String LOG_TAG = "BearerData"; + @UnsupportedAppUsage + public BearerData() { + } + /** * Bearer Data Subparameter Identifiers * (See 3GPP2 C.S0015-B, v2.0, table 4.5-1) @@ -95,6 +101,7 @@ public final class BearerData { * (Special rules apply for WAP-messages.) * (See 3GPP2 C.S0015-B, v2, 4.5.1) */ + @UnsupportedAppUsage public int messageId; /** @@ -106,7 +113,9 @@ public final class BearerData { public static final int PRIORITY_URGENT = 0x2; public static final int PRIORITY_EMERGENCY = 0x3; + @UnsupportedAppUsage public boolean priorityIndicatorSet = false; + @UnsupportedAppUsage public int priority = PRIORITY_NORMAL; /** @@ -144,6 +153,7 @@ public final class BearerData { public static final int DISPLAY_MODE_USER = 0x2; public boolean displayModeSet = false; + @UnsupportedAppUsage public int displayMode = DISPLAY_MODE_DEFAULT; /** @@ -207,6 +217,7 @@ public final class BearerData { * presence of a UDH in the structured data, any existing setting * will be overwritten. */ + @UnsupportedAppUsage public boolean hasUserDataHeader; /** @@ -214,6 +225,7 @@ public final class BearerData { * (e.g. padding bits, user data, user data header, etc) * (See 3GPP2 C.S.0015-B, v2, 4.5.2) */ + @UnsupportedAppUsage public UserData userData; /** @@ -244,6 +256,7 @@ public final class BearerData { private ZoneId mZoneId; + @UnsupportedAppUsage public TimeStamp() { mZoneId = ZoneId.systemDefault(); // 3GPP2 timestamps use the local timezone } @@ -295,6 +308,7 @@ public final class BearerData { } } + @UnsupportedAppUsage public TimeStamp msgCenterTimeStamp; public TimeStamp validityPeriodAbsolute; public TimeStamp deferredDeliveryTimeAbsolute; @@ -383,6 +397,7 @@ public final class BearerData { private static class CodingException extends Exception { + @UnsupportedAppUsage public CodingException(String s) { super(s); } @@ -476,6 +491,7 @@ public final class BearerData { outStream.skip(3); } + @UnsupportedAppUsage private static int countAsciiSeptets(CharSequence msg, boolean force) { int msgLen = msg.length(); if (force) return msgLen; @@ -518,6 +534,7 @@ public final class BearerData { return ted; } + @UnsupportedAppUsage private static byte[] encode7bitAscii(String msg, boolean force) throws CodingException { @@ -949,6 +966,7 @@ public final class BearerData { * * @return byte array of raw encoded SMS bearer data. */ + @UnsupportedAppUsage public static byte[] encode(BearerData bData) { bData.hasUserDataHeader = ((bData.userData != null) && (bData.userData.userDataHeader != null)); @@ -1200,6 +1218,7 @@ public final class BearerData { } } + @UnsupportedAppUsage private static void decodeUserDataPayload(UserData userData, boolean hasUserDataHeader) throws CodingException { @@ -1845,6 +1864,7 @@ public final class BearerData { * @return the number of bits to read from the stream * @throws CodingException if the specified encoding is not supported */ + @UnsupportedAppUsage private static int getBitsForNumFields(int msgEncoding, int numFields) throws CodingException { switch (msgEncoding) { diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java b/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java index d27a75815980..b268ee82529b 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java @@ -20,9 +20,10 @@ import android.util.SparseBooleanArray; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.SmsAddress; -import com.android.internal.telephony.cdma.sms.UserData; import com.android.internal.util.HexDump; +import dalvik.annotation.compat.UnsupportedAppUsage; + public class CdmaSmsAddress extends SmsAddress { /** @@ -33,6 +34,7 @@ public class CdmaSmsAddress extends SmsAddress { static public final int DIGIT_MODE_4BIT_DTMF = 0x00; static public final int DIGIT_MODE_8BIT_CHAR = 0x01; + @UnsupportedAppUsage public int digitMode; /** @@ -43,6 +45,7 @@ public class CdmaSmsAddress extends SmsAddress { static public final int NUMBER_MODE_NOT_DATA_NETWORK = 0x00; static public final int NUMBER_MODE_DATA_NETWORK = 0x01; + @UnsupportedAppUsage public int numberMode; /** @@ -70,6 +73,7 @@ public class CdmaSmsAddress extends SmsAddress { * This field shall be set to the number of address digits * (See 3GPP2 C.S0015-B, v2, 3.4.3.3) */ + @UnsupportedAppUsage public int numberOfDigits; /** @@ -83,6 +87,7 @@ public class CdmaSmsAddress extends SmsAddress { //static protected final int NUMBERING_PLAN_TELEX = 0x4; //static protected final int NUMBERING_PLAN_PRIVATE = 0x9; + @UnsupportedAppUsage public int numberPlan; /** @@ -90,7 +95,7 @@ public class CdmaSmsAddress extends SmsAddress { * are stored in the parent class address and origBytes fields, * respectively. */ - + @UnsupportedAppUsage public CdmaSmsAddress(){ } @@ -194,6 +199,7 @@ public class CdmaSmsAddress extends SmsAddress { * common punctuation. For alpha addresses, the string is cleaned * up by removing whitespace. */ + @UnsupportedAppUsage public static CdmaSmsAddress parse(String address) { CdmaSmsAddress addr = new CdmaSmsAddress(); addr.address = address; diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java b/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java index 49b5f7f1a2e2..be1eab1d4523 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java @@ -19,7 +19,7 @@ package com.android.internal.telephony.cdma.sms; import android.telephony.cdma.CdmaSmsCbProgramData; -import com.android.internal.telephony.cdma.sms.CdmaSmsSubaddress; +import dalvik.annotation.compat.UnsupportedAppUsage; public final class SmsEnvelope { /** @@ -80,6 +80,7 @@ public final class SmsEnvelope { * or receiving the message. * (See 3GPP2 C.S0015-B, v2, 3.4.3.1) */ + @UnsupportedAppUsage public int teleService = TELESERVICE_NOT_SET; /** @@ -87,6 +88,7 @@ public final class SmsEnvelope { * by the SMS message. * (See 3GPP2 C.S0015-B, v2, 3.4.3.2) */ + @UnsupportedAppUsage public int serviceCategory; /** @@ -137,8 +139,10 @@ public final class SmsEnvelope { * encoded bearer data * (See 3GPP2 C.S0015-B, v2, 3.4.3.7) */ + @UnsupportedAppUsage public byte[] bearerData; + @UnsupportedAppUsage public SmsEnvelope() { // nothing to see here } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java b/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java index bd8c83e63055..19e0b2d1ba35 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java @@ -18,10 +18,13 @@ package com.android.internal.telephony.gsm; import android.telephony.PhoneNumberUtils; -import java.text.ParseException; import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.SmsAddress; +import dalvik.annotation.compat.UnsupportedAppUsage; + +import java.text.ParseException; + public class GsmSmsAddress extends SmsAddress { static final int OFFSET_ADDRESS_LENGTH = 0; @@ -39,6 +42,7 @@ public class GsmSmsAddress extends SmsAddress { * @throws ParseException */ + @UnsupportedAppUsage public GsmSmsAddress(byte[] data, int offset, int length) throws ParseException { origBytes = new byte[length]; System.arraycopy(data, offset, origBytes, 0, length); @@ -136,6 +140,7 @@ public class GsmSmsAddress extends SmsAddress { * address indicating a "set" of "indicator 1" of type "voice message * waiting" */ + @UnsupportedAppUsage public boolean isCphsVoiceMessageSet() { // 0x11 means "set" "voice message waiting" "indicator 1" return isCphsVoiceMessageIndicatorAddress() @@ -148,6 +153,7 @@ public class GsmSmsAddress extends SmsAddress { * address indicating a "clear" of "indicator 1" of type "voice message * waiting" */ + @UnsupportedAppUsage public boolean isCphsVoiceMessageClear() { // 0x10 means "clear" "voice message waiting" "indicator 1" return isCphsVoiceMessageIndicatorAddress() diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java index c3d490a6d5cf..c15a8004b18c 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java @@ -215,7 +215,7 @@ public class GsmSmsCbMessage { private static Pair<Integer, List<Geometry>> parseWarningAreaCoordinates( byte[] pdu, int wacOffset) { // little-endian - int wacDataLength = (pdu[wacOffset + 1] << 8) | pdu[wacOffset]; + int wacDataLength = ((pdu[wacOffset + 1] & 0xff) << 8) | (pdu[wacOffset] & 0xff); int offset = wacOffset + 2; if (offset + wacDataLength > pdu.length) { diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java index 465840f3bc7f..d85cf151b9eb 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java @@ -21,6 +21,8 @@ import android.telephony.SmsCbEtwsInfo; import com.android.internal.telephony.SmsConstants; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.util.Arrays; import java.util.Locale; @@ -110,6 +112,7 @@ public class SmsCbHeader { private final int mSerialNumber; /** The Message Identifier in 3GPP is the same as the Service Category in CDMA. */ + @UnsupportedAppUsage private final int mMessageIdentifier; private final int mDataCodingScheme; @@ -128,6 +131,7 @@ public class SmsCbHeader { /** CMAS warning notification info. */ private final SmsCbCmasInfo mCmasInfo; + @UnsupportedAppUsage public SmsCbHeader(byte[] pdu) throws IllegalArgumentException { if (pdu == null || pdu.length < PDU_HEADER_LENGTH) { throw new IllegalArgumentException("Illegal PDU"); @@ -225,14 +229,17 @@ public class SmsCbHeader { } } + @UnsupportedAppUsage int getGeographicalScope() { return mGeographicalScope; } + @UnsupportedAppUsage int getSerialNumber() { return mSerialNumber; } + @UnsupportedAppUsage int getServiceCategory() { return mMessageIdentifier; } @@ -245,10 +252,12 @@ public class SmsCbHeader { return mDataCodingSchemeStructedData; } + @UnsupportedAppUsage int getPageIndex() { return mPageIndex; } + @UnsupportedAppUsage int getNumberOfPages() { return mNrOfPages; } diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java index 17e3bacb21d3..e7b385c5444b 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -16,18 +16,29 @@ package com.android.internal.telephony.gsm; +import static com.android.internal.telephony.SmsConstants.ENCODING_16BIT; +import static com.android.internal.telephony.SmsConstants.ENCODING_7BIT; +import static com.android.internal.telephony.SmsConstants.ENCODING_8BIT; +import static com.android.internal.telephony.SmsConstants.ENCODING_KSC5601; +import static com.android.internal.telephony.SmsConstants.ENCODING_UNKNOWN; +import static com.android.internal.telephony.SmsConstants.MAX_USER_DATA_BYTES; +import static com.android.internal.telephony.SmsConstants.MAX_USER_DATA_SEPTETS; +import static com.android.internal.telephony.SmsConstants.MessageClass; + +import android.content.res.Resources; import android.telephony.PhoneNumberUtils; import android.telephony.Rlog; -import android.content.res.Resources; import android.text.TextUtils; import com.android.internal.telephony.EncodeException; import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; -import com.android.internal.telephony.uicc.IccUtils; +import com.android.internal.telephony.Sms7BitEncodingTranslator; import com.android.internal.telephony.SmsHeader; import com.android.internal.telephony.SmsMessageBase; -import com.android.internal.telephony.Sms7BitEncodingTranslator; +import com.android.internal.telephony.uicc.IccUtils; + +import dalvik.annotation.compat.UnsupportedAppUsage; import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; @@ -35,16 +46,6 @@ import java.text.ParseException; import java.time.LocalDateTime; import java.time.ZoneOffset; -import static com.android.internal.telephony.SmsConstants.MessageClass; -import static com.android.internal.telephony.SmsConstants.ENCODING_UNKNOWN; -import static com.android.internal.telephony.SmsConstants.ENCODING_7BIT; -import static com.android.internal.telephony.SmsConstants.ENCODING_8BIT; -import static com.android.internal.telephony.SmsConstants.ENCODING_16BIT; -import static com.android.internal.telephony.SmsConstants.ENCODING_KSC5601; -import static com.android.internal.telephony.SmsConstants.MAX_USER_DATA_SEPTETS; -import static com.android.internal.telephony.SmsConstants.MAX_USER_DATA_BYTES; -import static com.android.internal.telephony.SmsConstants.MAX_USER_DATA_BYTES_WITH_HEADER; - /** * A Short Message Service message. * @@ -99,12 +100,20 @@ public class SmsMessage extends SmsMessageBase { private static final int INVALID_VALIDITY_PERIOD = -1; + @UnsupportedAppUsage + public SmsMessage() { + } + public static class SubmitPdu extends SubmitPduBase { + @UnsupportedAppUsage + public SubmitPdu() { + } } /** * Create an SmsMessage from a raw PDU. */ + @UnsupportedAppUsage public static SmsMessage createFromPdu(byte[] pdu) { try { SmsMessage msg = new SmsMessage(); @@ -169,6 +178,7 @@ public class SmsMessage extends SmsMessageBase { * * @hide */ + @UnsupportedAppUsage public static SmsMessage createFromEfRecord(int index, byte[] data) { try { SmsMessage msg = new SmsMessage(); @@ -259,6 +269,7 @@ public class SmsMessage extends SmsMessageBase { * Returns null on encode error. * @hide */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header) { @@ -281,6 +292,7 @@ public class SmsMessage extends SmsMessageBase { * Returns null on encode error. * @hide */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -304,6 +316,7 @@ public class SmsMessage extends SmsMessageBase { * Returns null on encode error. * @hide */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -444,6 +457,7 @@ public class SmsMessage extends SmsMessageBase { * @throws UnsupportedEncodingException * @throws EncodeException if String is too large to encode */ + @UnsupportedAppUsage private static byte[] encodeUCS2(String message, byte[] header) throws UnsupportedEncodingException, EncodeException { byte[] userData, textPart; @@ -478,6 +492,7 @@ public class SmsMessage extends SmsMessageBase { * address, if applicable, and the encoded message. * Returns null on encode error. */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested) { @@ -496,6 +511,7 @@ public class SmsMessage extends SmsMessageBase { * address, if applicable, and the encoded message. * Returns null on encode error. */ + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, int validityPeriod) { @@ -576,6 +592,7 @@ public class SmsMessage extends SmsMessageBase { * @param ret <code>SubmitPdu</code> containing the encoded SC * address, if applicable, and the encoded message. Returns null on encode error. */ + @UnsupportedAppUsage private static ByteArrayOutputStream getSubmitPduHead( String scAddress, String destinationAddress, byte mtiByte, boolean statusReportRequested, SubmitPdu ret) { @@ -622,12 +639,16 @@ public class SmsMessage extends SmsMessageBase { } private static class PduParser { + @UnsupportedAppUsage byte mPdu[]; + @UnsupportedAppUsage int mCur; SmsHeader mUserDataHeader; byte[] mUserData; + @UnsupportedAppUsage int mUserDataSeptetPadding; + @UnsupportedAppUsage PduParser(byte[] pdu) { mPdu = pdu; mCur = 0; @@ -667,6 +688,7 @@ public class SmsMessage extends SmsMessageBase { /** * returns non-sign-extended byte value */ + @UnsupportedAppUsage int getByte() { return mPdu[mCur++] & 0xff; } @@ -808,6 +830,7 @@ public class SmsMessage extends SmsMessageBase { * * @return the user data payload, not including the headers */ + @UnsupportedAppUsage byte[] getUserData() { return mUserData; } @@ -864,6 +887,7 @@ public class SmsMessage extends SmsMessageBase { * @param byteCount the number of bytes in the user data payload * @return a String with the decoded characters */ + @UnsupportedAppUsage String getUserDataUCS2(int byteCount) { String ret; @@ -912,6 +936,7 @@ public class SmsMessage extends SmsMessageBase { * @param use7bitOnly ignore (but still count) illegal characters if true * @return TextEncodingDetails */ + @UnsupportedAppUsage public static TextEncodingDetails calculateLength(CharSequence msgBody, boolean use7bitOnly) { CharSequence newMsgBody = null; @@ -959,6 +984,7 @@ public class SmsMessage extends SmsMessageBase { } /** {@inheritDoc} */ + @UnsupportedAppUsage @Override public boolean isMWIClearMessage() { if (mIsMwi && !mMwiSense) { @@ -970,6 +996,7 @@ public class SmsMessage extends SmsMessageBase { } /** {@inheritDoc} */ + @UnsupportedAppUsage @Override public boolean isMWISetMessage() { if (mIsMwi && mMwiSense) { @@ -981,6 +1008,7 @@ public class SmsMessage extends SmsMessageBase { } /** {@inheritDoc} */ + @UnsupportedAppUsage @Override public boolean isMwiDontStore() { if (mIsMwi && mMwiDontStore) { @@ -1000,12 +1028,14 @@ public class SmsMessage extends SmsMessageBase { } /** {@inheritDoc} */ + @UnsupportedAppUsage @Override public int getStatus() { return mStatus; } /** {@inheritDoc} */ + @UnsupportedAppUsage @Override public boolean isStatusReportMessage() { return mIsStatusReportMessage; diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java index 96e215cf6f45..f2d46244d60e 100644 --- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java +++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java @@ -25,6 +25,8 @@ import android.telephony.Rlog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.GsmAlphabet; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.io.UnsupportedEncodingException; import java.util.List; @@ -53,6 +55,7 @@ public class IccUtils { * * Stops on invalid BCD value, returning string so far */ + @UnsupportedAppUsage public static String bcdToString(byte[] data, int offset, int length) { StringBuilder ret = new StringBuilder(length*2); @@ -180,6 +183,7 @@ public class IccUtils { /** * Decode cdma byte into String. */ + @UnsupportedAppUsage public static String cdmaBcdToString(byte[] data, int offset, int length) { StringBuilder ret = new StringBuilder(length); @@ -215,6 +219,7 @@ public class IccUtils { * assume the digit is set to 0 but shall store the entire field * exactly as received" */ + @UnsupportedAppUsage public static int gsmBcdByteToInt(byte b) { int ret = 0; @@ -237,6 +242,7 @@ public class IccUtils { * is in the least significant nibble and the most significant * is in the most significant nibble. */ + @UnsupportedAppUsage public static int cdmaBcdByteToInt(byte b) { int ret = 0; @@ -288,6 +294,7 @@ public class IccUtils { * contain a 16 bit number which defines the complete 16 bit * base pointer to a "half page" in the UCS2 code space... */ + @UnsupportedAppUsage public static String adnStringFieldToString(byte[] data, int offset, int length) { if (length == 0) { @@ -379,6 +386,7 @@ public class IccUtils { return GsmAlphabet.gsm8BitUnpackedToString(data, offset, length, defaultCharset.trim()); } + @UnsupportedAppUsage public static int hexCharToInt(char c) { if (c >= '0' && c <= '9') return (c - '0'); @@ -398,6 +406,7 @@ public class IccUtils { * * @throws RuntimeException on invalid format */ + @UnsupportedAppUsage public static byte[] hexStringToBytes(String s) { byte[] ret; @@ -424,6 +433,7 @@ public class IccUtils { * * @return hex string representation of bytes array */ + @UnsupportedAppUsage public static String bytesToHexString(byte[] bytes) { if (bytes == null) return null; @@ -451,6 +461,7 @@ public class IccUtils { * "offset" points to "octet 3", the coding scheme byte * empty string returned on decode error */ + @UnsupportedAppUsage public static String networkNameToString(byte[] data, int offset, int length) { String ret; @@ -501,6 +512,7 @@ public class IccUtils { * @param length The length of image body * @return The bitmap */ + @UnsupportedAppUsage public static Bitmap parseToBnW(byte[] data, int length){ int valueIndex = 0; int width = data[valueIndex++] & 0xFF; @@ -543,6 +555,7 @@ public class IccUtils { * @param transparency with or without transparency * @return The color bitmap */ + @UnsupportedAppUsage public static Bitmap parseToRGB(byte[] data, int length, boolean transparency) { int valueIndex = 0; diff --git a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java index 81937e6b7005..f8e338e93002 100644 --- a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java +++ b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java @@ -106,13 +106,18 @@ public class BootImageProfileTest implements IDeviceTest { // Test the profile contents contain common methods for core-oj that would normally be AOT // compiled. res = mTestDevice.executeShellCommand("profman --dump-classes-and-methods --profile-file=" - + SYSTEM_SERVER_PROFILE + " --apk=/apex/com.android.art/javalib/core-oj.jar"); + + SYSTEM_SERVER_PROFILE + " --apk=/apex/com.android.art/javalib/core-oj.jar" + + " --apk=/system/framework/services.jar"); boolean sawObjectInit = false; + boolean sawPmInit = false; for (String line : res.split("\n")) { if (line.contains("Ljava/lang/Object;-><init>()V")) { sawObjectInit = true; + } else if (line.contains("Lcom/android/server/pm/PackageManagerService;-><init>")) { + sawPmInit = true; } } assertTrue("Did not see Object.<init> in " + res, sawObjectInit); + assertTrue("Did not see PackageManagerService.<init> in " + res, sawPmInit); } } diff --git a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java index 4315514cb7a5..98e066f541cc 100644 --- a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java +++ b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java @@ -19,6 +19,7 @@ package com.android.tests.rollback.host; import static org.junit.Assert.assertTrue; import com.android.ddmlib.Log.LogLevel; +import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.log.LogUtil.CLog; import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; @@ -97,7 +98,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { + "watchdog_request_timeout_millis 300000"); // Simulate re-installation of new NetworkStack with rollbacks enabled getDevice().executeShellCommand("pm install -r --staged --enable-rollback " - + "/system/priv-app/NetworkStack/NetworkStack.apk"); + + getNetworkStackPath()); // Sleep to allow writes to disk before reboot Thread.sleep(5000); @@ -143,7 +144,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { + "watchdog_request_timeout_millis 300000"); // Simulate re-installation of new NetworkStack with rollbacks enabled getDevice().executeShellCommand("pm install -r --staged --enable-rollback " - + "/system/priv-app/NetworkStack/NetworkStack.apk"); + + getNetworkStackPath()); // Sleep to allow writes to disk before reboot Thread.sleep(5000); @@ -167,4 +168,9 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { // Verify rollback was not executed after health check deadline runPhase("assertNoNetworkStackRollbackCommitted"); } + + private String getNetworkStackPath() throws DeviceNotAvailableException { + // Find the NetworkStack path (can be NetworkStack.apk or NetworkStackNext.apk) + return getDevice().executeShellCommand("ls /system/priv-app/NetworkStack*/*.apk"); + } } diff --git a/tests/net/common/java/android/net/NetworkScoreTest.kt b/tests/net/common/java/android/net/NetworkScoreTest.kt new file mode 100644 index 000000000000..30836b7c9be1 --- /dev/null +++ b/tests/net/common/java/android/net/NetworkScoreTest.kt @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net + +import android.os.Parcelable +import androidx.test.filters.SmallTest +import androidx.test.runner.AndroidJUnit4 +import com.android.testutils.assertParcelSane +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith + +private const val TEST_SCORE = 80 +private const val KEY_DEFAULT_CAPABILITIES = "DEFAULT_CAPABILITIES" + +@RunWith(AndroidJUnit4::class) +@SmallTest +class NetworkScoreTest { + @Test + fun testParcelNetworkScore() { + val networkScore = NetworkScore() + val defaultCap = NetworkCapabilities() + networkScore.putExtension(KEY_DEFAULT_CAPABILITIES, defaultCap) + assertEquals(defaultCap, networkScore.getExtension(KEY_DEFAULT_CAPABILITIES)) + networkScore.putIntExtension(NetworkScore.LEGACY_SCORE, TEST_SCORE) + assertEquals(TEST_SCORE, networkScore.getIntExtension(NetworkScore.LEGACY_SCORE)) + assertParcelSane(networkScore, 1) + } + + @Test + fun testNullKeyAndValue() { + val networkScore = NetworkScore() + val defaultCap = NetworkCapabilities() + networkScore.putIntExtension(null, TEST_SCORE) + assertEquals(TEST_SCORE, networkScore.getIntExtension(null)) + networkScore.putExtension(null, defaultCap) + assertEquals(defaultCap, networkScore.getExtension(null)) + networkScore.putExtension(null, null) + val result: Parcelable? = networkScore.getExtension(null) + assertEquals(null, result) + } + + @Test + fun testRemoveExtension() { + val networkScore = NetworkScore() + val defaultCap = NetworkCapabilities() + networkScore.putExtension(KEY_DEFAULT_CAPABILITIES, defaultCap) + networkScore.putIntExtension(NetworkScore.LEGACY_SCORE, TEST_SCORE) + assertEquals(defaultCap, networkScore.getExtension(KEY_DEFAULT_CAPABILITIES)) + assertEquals(TEST_SCORE, networkScore.getIntExtension(NetworkScore.LEGACY_SCORE)) + networkScore.removeExtension(KEY_DEFAULT_CAPABILITIES) + networkScore.removeExtension(NetworkScore.LEGACY_SCORE) + val result: Parcelable? = networkScore.getExtension(KEY_DEFAULT_CAPABILITIES) + assertEquals(null, result) + assertEquals(0, networkScore.getIntExtension(NetworkScore.LEGACY_SCORE)) + } + + @Test + fun testEqualsNetworkScore() { + val ns1 = NetworkScore() + val ns2 = NetworkScore() + assertTrue(ns1.equals(ns2)) + assertEquals(ns1.hashCode(), ns2.hashCode()) + + ns1.putIntExtension(NetworkScore.LEGACY_SCORE, TEST_SCORE) + assertFalse(ns1.equals(ns2)) + assertNotEquals(ns1.hashCode(), ns2.hashCode()) + ns2.putIntExtension(NetworkScore.LEGACY_SCORE, TEST_SCORE) + assertTrue(ns1.equals(ns2)) + assertEquals(ns1.hashCode(), ns2.hashCode()) + + val defaultCap = NetworkCapabilities() + ns1.putExtension(KEY_DEFAULT_CAPABILITIES, defaultCap) + assertFalse(ns1.equals(ns2)) + assertNotEquals(ns1.hashCode(), ns2.hashCode()) + ns2.putExtension(KEY_DEFAULT_CAPABILITIES, defaultCap) + assertTrue(ns1.equals(ns2)) + assertEquals(ns1.hashCode(), ns2.hashCode()) + + ns1.putIntExtension(null, 10) + assertFalse(ns1.equals(ns2)) + assertNotEquals(ns1.hashCode(), ns2.hashCode()) + ns2.putIntExtension(null, 10) + assertTrue(ns1.equals(ns2)) + assertEquals(ns1.hashCode(), ns2.hashCode()) + } +} diff --git a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java index 142769f61335..535298f9b09a 100644 --- a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java @@ -39,6 +39,7 @@ import android.net.NetworkCapabilities; import android.net.NetworkFactory; import android.net.NetworkInfo; import android.net.NetworkMisc; +import android.net.NetworkScore; import android.os.INetworkManagementService; import android.text.format.DateUtils; @@ -354,8 +355,10 @@ public class LingerMonitorTest { NetworkCapabilities caps = new NetworkCapabilities(); caps.addCapability(0); caps.addTransportType(transport); + NetworkScore ns = new NetworkScore(); + ns.putIntExtension(NetworkScore.LEGACY_SCORE, 50); NetworkAgentInfo nai = new NetworkAgentInfo(null, null, new Network(netId), info, null, - caps, 50, mCtx, null, mMisc, mConnService, mNetd, mDnsResolver, mNMS, + caps, ns, mCtx, null, mMisc, mConnService, mNetd, mDnsResolver, mNMS, NetworkFactory.SerialNumber.NONE); nai.everValidated = true; return nai; diff --git a/tools/aapt2/compile/PseudolocaleGenerator.cpp b/tools/aapt2/compile/PseudolocaleGenerator.cpp index c5de9e058907..5e0300b3071b 100644 --- a/tools/aapt2/compile/PseudolocaleGenerator.cpp +++ b/tools/aapt2/compile/PseudolocaleGenerator.cpp @@ -231,7 +231,7 @@ class Visitor : public ValueVisitor { Visitor sub_visitor(pool_, method_); if (plural->values[i]) { plural->values[i]->Accept(&sub_visitor); - if (sub_visitor.value) { + if (sub_visitor.item) { localized->values[i] = std::move(sub_visitor.item); } else { localized->values[i] = std::unique_ptr<Item>(plural->values[i]->Clone(pool_)); diff --git a/tools/aapt2/compile/PseudolocaleGenerator_test.cpp b/tools/aapt2/compile/PseudolocaleGenerator_test.cpp index 31358020ab60..e816c86e20a8 100644 --- a/tools/aapt2/compile/PseudolocaleGenerator_test.cpp +++ b/tools/aapt2/compile/PseudolocaleGenerator_test.cpp @@ -234,6 +234,27 @@ TEST(PseudolocaleGeneratorTest, PseudolocalizeOnlyDefaultConfigs) { test::ParseConfigOrDie("ar-rXB"))); } +TEST(PseudolocaleGeneratorTest, PluralsArePseudolocalized) { + std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build(); + std::unique_ptr<ResourceTable> table = + test::ResourceTableBuilder().SetPackageId("com.pkg", 0x7F).Build(); + std::unique_ptr<Plural> plural = util::make_unique<Plural>(); + plural->values = {util::make_unique<String>(table->string_pool.MakeRef("zero")), + util::make_unique<String>(table->string_pool.MakeRef("one"))}; + ASSERT_TRUE(table->AddResource(test::ParseNameOrDie("com.pkg:plurals/foo"), ConfigDescription{}, + {}, std::move(plural), context->GetDiagnostics())); + std::unique_ptr<Plural> expected = util::make_unique<Plural>(); + expected->values = {util::make_unique<String>(table->string_pool.MakeRef("[žéŕö one]")), + util::make_unique<String>(table->string_pool.MakeRef("[öñé one]"))}; + + PseudolocaleGenerator generator; + ASSERT_TRUE(generator.Consume(context.get(), table.get())); + + const auto* actual = test::GetValueForConfig<Plural>(table.get(), "com.pkg:plurals/foo", + test::ParseConfigOrDie("en-rXA")); + EXPECT_TRUE(actual->Equals(expected.get())); +} + TEST(PseudolocaleGeneratorTest, RespectUntranslateableSections) { std::unique_ptr<IAaptContext> context = test::ContextBuilder().SetCompilationPackage("android").Build(); diff --git a/tools/aapt2/format/Container.cpp b/tools/aapt2/format/Container.cpp index f1890488276c..9cef7b3d2ce3 100644 --- a/tools/aapt2/format/Container.cpp +++ b/tools/aapt2/format/Container.cpp @@ -30,6 +30,7 @@ namespace aapt { constexpr const static uint32_t kContainerFormatMagic = 0x54504141u; constexpr const static uint32_t kContainerFormatVersion = 1u; +constexpr const static size_t kPaddingAlignment = 4u; ContainerWriter::ContainerWriter(ZeroCopyOutputStream* out, size_t entry_count) : out_(out), total_entry_count_(entry_count), current_entry_count_(0u) { @@ -49,11 +50,17 @@ ContainerWriter::ContainerWriter(ZeroCopyOutputStream* out, size_t entry_count) } } -inline static void WritePadding(int padding, CodedOutputStream* out) { - if (padding < 4) { - const uint32_t zero = 0u; - out->WriteRaw(&zero, padding); - } +inline static size_t CalculatePaddingForAlignment(size_t size) { + size_t overage = size % kPaddingAlignment; + return overage == 0 ? 0 : kPaddingAlignment - overage; +} + +inline static void WritePadding(size_t padding, CodedOutputStream* out) { + CHECK(padding < kPaddingAlignment); + const uint32_t zero = 0u; + static_assert(sizeof(zero) >= kPaddingAlignment, "Not enough source bytes for padding"); + + out->WriteRaw(&zero, padding); } bool ContainerWriter::AddResTableEntry(const pb::ResourceTable& table) { @@ -70,7 +77,7 @@ bool ContainerWriter::AddResTableEntry(const pb::ResourceTable& table) { // Write the aligned size. const ::google::protobuf::uint64 size = table.ByteSize(); - const int padding = 4 - (size % 4); + const int padding = CalculatePaddingForAlignment(size); coded_out.WriteLittleEndian64(size); // Write the table. @@ -103,9 +110,9 @@ bool ContainerWriter::AddResFileEntry(const pb::internal::CompiledFile& file, // Write the aligned size. const ::google::protobuf::uint32 header_size = file.ByteSize(); - const int header_padding = 4 - (header_size % 4); + const int header_padding = CalculatePaddingForAlignment(header_size); const ::google::protobuf::uint64 data_size = in->TotalSize(); - const int data_padding = 4 - (data_size % 4); + const int data_padding = CalculatePaddingForAlignment(data_size); coded_out.WriteLittleEndian64(kResFileEntryHeaderSize + header_size + header_padding + data_size + data_padding); diff --git a/tools/aapt2/formats.md b/tools/aapt2/formats.md index bb31a005ef42..25a0e798dea2 100644 --- a/tools/aapt2/formats.md +++ b/tools/aapt2/formats.md @@ -23,7 +23,7 @@ boundary, so if a previous entry ends unaligned, padding must be inserted. | Size (in bytes) | Field | Description | |:----------------|:---------------|:----------------------------------------------------------------------------------------------------------| | `4` | `entry_type` | The type of the entry. This can be one of two types: `RES_TABLE (0x00000000)` or `RES_FILE (0x00000001)`. | -| `8` | `entry_length` | The length of the data that follows. | +| `8` | `entry_length` | The length of the data that follows. Do not use if `entry_type` is `RES_FILE`; this value may be wrong. | | `entry_length` | `data` | The payload. The contents of this varies based on the `entry_type`. | If the `entry_type` is equal to `RES_TABLE (0x00000000)`, the `data` field contains a serialized @@ -32,13 +32,14 @@ If the `entry_type` is equal to `RES_TABLE (0x00000000)`, the `data` field conta If the `entry_type` is equal to `RES_FILE (0x00000001)`, the `data` field contains the following: -| Size (in bytes) | Field | Description | -|:----------------|:---------------|:----------------------------------------------------------------------------------------------------------| -| `4` | `header_size` | The size of the `header` field. | -| `8` | `data_size` | The size of the `data` field. | -| `header_size` | `header` | The serialized Protobuf message [aapt.pb.internal.CompiledFile](ResourcesInternal.proto). | -| `x` | `padding` | Up to 4 bytes of zeros, if padding is necessary to align the `data` field on a 32-bit boundary. | -| `data_size` | `data` | The payload, which is determined by the `type` field in the `aapt.pb.internal.CompiledFile`. This can be a PNG file, binary XML, or [aapt.pb.XmlNode](Resources.proto). | +| Size (in bytes) | Field | Description | +|:----------------|:-----------------|:----------------------------------------------------------------------------------------------------------| +| `4` | `header_size` | The size of the `header` field. | +| `8` | `data_size` | The size of the `data` field. | +| `header_size` | `header` | The serialized Protobuf message [aapt.pb.internal.CompiledFile](ResourcesInternal.proto). | +| `x` | `header_padding` | Up to 3 bytes of zeros, if padding is necessary to align the `data` field on a 32-bit boundary. | +| `data_size` | `data` | The payload, which is determined by the `type` field in the `aapt.pb.internal.CompiledFile`. This can be a PNG file, binary XML, or [aapt.pb.XmlNode](Resources.proto). | +| `y` | `data_padding` | Up to 3 bytes of zeros, if `data_size` is not a multiple of 4. | ## AAPT2 Static Library Format (extension `.sapk`) diff --git a/tools/aapt2/java/ProguardRules.h b/tools/aapt2/java/ProguardRules.h index f9656d112b7b..b15df59f56a6 100644 --- a/tools/aapt2/java/ProguardRules.h +++ b/tools/aapt2/java/ProguardRules.h @@ -99,11 +99,13 @@ bool CollectLocations(const UsageLocation& location, const KeepSet& keep_set, // inline bool operator==(const UsageLocation& lhs, const UsageLocation& rhs) { + // The "source" member is ignored because we only need "name" for outputting + // keep rules; "source" is used for comments. return lhs.name == rhs.name; } -inline int operator<(const UsageLocation& lhs, const UsageLocation& rhs) { - return lhs.name.compare(rhs.name); +inline bool operator<(const UsageLocation& lhs, const UsageLocation& rhs) { + return lhs.name.compare(rhs.name) < 0; } // diff --git a/tools/aapt2/java/ProguardRules_test.cpp b/tools/aapt2/java/ProguardRules_test.cpp index 559b07af3e80..25b55ab003b0 100644 --- a/tools/aapt2/java/ProguardRules_test.cpp +++ b/tools/aapt2/java/ProguardRules_test.cpp @@ -364,4 +364,12 @@ TEST(ProguardRulesTest, TransitionRulesAreEmitted) { "-keep class com.foo.Bar { <init>(android.content.Context, android.util.AttributeSet); }")); } +TEST(ProguardRulesTest, UsageLocationComparator) { + proguard::UsageLocation location1 = {{"pkg", ResourceType::kAttr, "x"}}; + proguard::UsageLocation location2 = {{"pkg", ResourceType::kAttr, "y"}}; + + EXPECT_EQ(location1 < location2, true); + EXPECT_EQ(location2 < location1, false); +} + } // namespace aapt diff --git a/tools/apilint/apilint b/tools/apilint/apilint deleted file mode 100755 index e42857f1a190..000000000000 --- a/tools/apilint/apilint +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash - -# 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. - -if [ "$1" == "--help" -o "$1" == "-h" ]; then -echo "Usage: apilint [FILTERS...]" -echo " Shows lint from currently open files (as diffed from HEAD), i.e. errors" -echo " you will receive if you upload this CL." -echo -echo "Usage: apilint --all [FILTERS...]" -echo " Shows all lint errors present in the current working directory, regardless" -echo " of when they were added." -echo -echo "Usage: apilint --level API_LEVEL [FILTERS...]" -echo " Shows lint as it stands in API_LEVEL" -echo -echo "Usage: apilint --shal SHA [FILTERS...]" -echo " Shows lint from locally commited git change SHA." -echo -echo "Usage: apilint --unreleased [FILTERS...]" -echo " Shows all lint errors in the current working directory directory added since" -echo " the last released SDK version." -echo -echo "FILTERS" -echo " List of class or package names by which to filter the results." -echo -exit -fi - -if [ \( -z "$ANDROID_BUILD_TOP" \) \ - -a \( ! -f frameworks/base/api/current.txt \) \ - -a \( ! -f frameworks/base/api/system-current.txt \) \ - ]; then - echo "apilint must be run either with ANDROID_BUILD_TOP set or from the" 1>&2 - echo "root of the android source tree" 1>&2 - exit 1 -fi - -if [ ${ANDROID_BUILD_TOP:0:1} != "/" ]; then - echo "ANDROID_BUILD_TOP must be an absolute path, not: $ANDROID_BUILD_TOP" 1>&2 - exit 1 -fi - -if [ -z "$ANDROID_BUILD_TOP" ]; then - ANDROID_BUILD_TOP=$(pwd) -fi - -FW_BASE=$ANDROID_BUILD_TOP/frameworks/base - -MODE=open - -OPTIONS=$(getopt -n apilint -o "" -l "all,sha:,unreleased" -- "$@") - -[ $? -eq 0 ] || { - exit 1 -} - -eval set -- "$OPTIONS" -while true; do - case "$1" in - --all) - MODE=all - ;; - --sha) - shift; # The arg is next in position args - MODE=sha - SHA=$1 - ;; - --unreleased) - MODE=unreleased - ;; - --) - shift - break - ;; - esac - shift -done -FILTERS= -for var in "$@" -do - FILTERS="$FILTERS --filter $var" -done - -if [ $MODE = "all" ]; then - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SDK" \ - $FILTERS \ - $ANDROID_BUILD_TOP/frameworks/base/api/current.txt - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SystemApi" \ - $FILTERS \ - --base-current $ANDROID_BUILD_TOP/frameworks/base/api/current.txt \ - $ANDROID_BUILD_TOP/frameworks/base/api/system-current.txt -elif [ $MODE = "open" ]; then - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SDK" \ - $FILTERS \ - $ANDROID_BUILD_TOP/frameworks/base/api/current.txt \ - <(cd $FW_BASE ; git show HEAD:api/current.txt) - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SystemApi" \ - $FILTERS \ - --base-current $ANDROID_BUILD_TOP/frameworks/base/api/current.txt \ - --base-previous <(cd $FW_BASE ; git show HEAD:api/current.txt) \ - $ANDROID_BUILD_TOP/frameworks/base/api/system-current.txt \ - <(cd $FW_BASE ; git show HEAD:api/system-current.txt) -elif [ $MODE = "sha" ]; then - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SDK" \ - $FILTERS \ - <(cd $FW_BASE ; git show $SHA:api/current.txt) \ - <(cd $FW_BASE ; git show $SHA^:api/current.txt) - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SystemApi" \ - $FILTERS \ - --base-current <(cd $FW_BASE ; git show $SHA:api/current.txt) \ - --base-previous <(cd $FW_BASE ; git show $SHA^:api/current.txt) \ - <(cd $FW_BASE ; git show $SHA:api/system-current.txt) \ - <(cd $FW_BASE ; git show $SHA^:api/system-current.txt) -elif [ $MODE = "unreleased" ]; then - LAST_SDK=$(ls $ANDROID_BUILD_TOP/prebuilts/sdk | grep "^[0-9][0-9]*$" | sort -n | tail -n 1) - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SDK" \ - $FILTERS \ - $ANDROID_BUILD_TOP/frameworks/base/api/current.txt \ - $ANDROID_BUILD_TOP/prebuilts/sdk/$LAST_SDK/public/api/android.txt - python2.7 -B $ANDROID_BUILD_TOP/frameworks/base/tools/apilint/apilint.py \ - --title "SystemApi" \ - $FILTERS \ - --base-current $ANDROID_BUILD_TOP/frameworks/base/api/current.txt \ - --base-previous $ANDROID_BUILD_TOP/prebuilts/sdk/$LAST_SDK/public/api/android.txt \ - $ANDROID_BUILD_TOP/frameworks/base/api/system-current.txt \ - $ANDROID_BUILD_TOP/prebuilts/sdk/$LAST_SDK/system/api/android.txt -fi diff --git a/tools/apilint/apilint.py b/tools/apilint/apilint.py deleted file mode 100644 index 912c1ad377c1..000000000000 --- a/tools/apilint/apilint.py +++ /dev/null @@ -1,2353 +0,0 @@ -#!/usr/bin/env python - -# Copyright (C) 2014 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the 'License'); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an 'AS IS' BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -""" -Enforces common Android public API design patterns. It ignores lint messages from -a previous API level, if provided. - -Usage: apilint.py current.txt -Usage: apilint.py current.txt previous.txt - -You can also splice in blame details like this: -$ 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, itertools - - -BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8) - -ALLOW_GOOGLE = False -USE_COLOR = True - -def format(fg=None, bg=None, bright=False, bold=False, dim=False, reset=False): - # manually derived from http://en.wikipedia.org/wiki/ANSI_escape_code#Codes - if not USE_COLOR: return "" - codes = [] - if reset: codes.append("0") - else: - if not fg is None: codes.append("3%d" % (fg)) - if not bg is None: - if not bright: codes.append("4%d" % (bg)) - else: codes.append("10%d" % (bg)) - if bold: codes.append("1") - elif dim: codes.append("2") - else: codes.append("22") - return "\033[%sm" % (";".join(codes)) - - -class Field(): - def __init__(self, clazz, line, raw, blame, sig_format = 1): - self.clazz = clazz - self.line = line - self.raw = raw.strip(" {;") - self.blame = blame - - 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) - - 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("@") ] - - 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.annotations = [] - - self.ident = "-".join((self.typ, self.name, self.value or "")) - - def __hash__(self): - return hash(self.raw) - - def __repr__(self): - return self.raw - - -class Argument(object): - - __slots__ = ["type", "annotations", "name", "default"] - - def __init__(self, type): - self.type = type - self.annotations = [] - self.name = None - self.default = None - - -class Method(): - def __init__(self, clazz, line, raw, blame, sig_format = 1): - self.clazz = clazz - self.line = line - self.raw = raw.strip(" {;") - self.blame = blame - - 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.detailed_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.detailed_args.append(Argument(arg[0])) - - # parse throws - self.throws = [] - for throw in re.split(",\s*", raw_throws): - self.throws.append(throw) - - self.annotations = [] - else: - raise ValueError("Unknown signature format: " + sig_format) - - self.args = map(lambda a: a.type, self.detailed_args) - self.ident = "-".join((self.typ, self.name, "-".join(self.args))) - - 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) - - def __repr__(self): - return self.raw - - -class Class(): - def __init__(self, pkg, line, raw, blame, sig_format = 1): - self.pkg = pkg - self.line = line - self.raw = raw.strip(" {;") - self.blame = blame - self.ctors = [] - self.fields = [] - self.methods = [] - self.annotations = [] - - 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)) - - if "extends" in raw: - self.extends = raw[raw.index("extends")+1] - else: - self.extends = None - - if "implements" in raw: - self.implements = raw[raw.index("implements")+1] - self.implements_all = [self.implements] - else: - self.implements = None - self.implements_all = [] - else: - 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): - self.ctors.extend(other.ctors) - self.fields.extend(other.fields) - self.methods.extend(other.methods) - - def __hash__(self): - return hash((self.raw, tuple(self.ctors), tuple(self.fields), tuple(self.methods))) - - def __repr__(self): - return self.raw - - -class Package(): - NAME = re.compile("package(?: .*)? ([A-Za-z0-9.]+)") - - def __init__(self, line, raw, blame): - self.line = line - self.raw = raw.strip(" {;") - self.blame = blame - - self.name = Package.NAME.match(raw).group(1) - self.name_path = self.name.split(".") - - def __repr__(self): - return self.raw - -class V2Tokenizer(object): - __slots__ = ["raw"] - - SIGNATURE_PREFIX = "// Signature format: " - 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"] - - FIELD_KINDS = ("field", "property", "enum_constant") - MODIFIERS = set("public protected internal private abstract default static final transient volatile synchronized native operator sealed strictfp infix inline suspend vararg".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) - method.annotations = self.parse_annotations() - method.split.extend(self.parse_modifiers()) - self.parse_matching_paren("<", ">") - if "@Deprecated" in method.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.detailed_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 = [] - clazz.annotations = self.parse_annotations() - if "@Deprecated" in clazz.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 - clazz.implements_all = self.parse_implements() - # The checks assume that interfaces are always found in implements, which isn't true for - # subinterfaces. - if not clazz.implements_all and "interface" in clazz.split: - clazz.implements_all = [clazz.extends] - clazz.implements = clazz.implements_all[0] if clazz.implements_all else None - self.parse_token("{") - self.parse_eof() - - def parse_into_field(self, field): - kind = self.parse_one_of(*V2LineParser.FIELD_KINDS) - field.split = [kind] - field.annotations = self.parse_annotations() - if "@Deprecated" in field.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): - self.parse_annotations() - type = self.parse_token() - if type[-1] == '.': - self.parse_annotations() - 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 == "@": - self.parse_annotation() - elif 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_if("vararg") # kotlin vararg - annotations = self.parse_annotations() - arg = Argument(self.parse_arg_type()) - arg.annotations = annotations - l = self.lookahead() - if l != "," and l != ")": - if self.lookahead() != '=': - arg.name = self.parse_token() # kotlin argument name - if self.parse_if('='): # kotlin default value - arg.default = self.parse_expression() - return arg - - def parse_expression(self): - while not self.lookahead() in [')', ',', ';']: - (self.parse_matching_paren('(', ')') or - self.parse_matching_paren('{', '}') or - self.parse_token()) - - 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_expression() - - 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=[]): - api = {} - in_classes_with_base = _retry_iterator(in_classes_with_base) - - if base_f: - base_classes = _retry_iterator(_parse_stream_to_generator(base_f)) - else: - base_classes = [] - - def handle_class(clazz): - if clazz_cb: - clazz_cb(clazz) - else: # In callback mode, don't keep track of the full API - api[clazz.fullname] = clazz - - def handle_missed_classes_with_base(clazz): - for c in _yield_until_matching_class(in_classes_with_base, clazz): - base_class = _skip_to_matching_class(base_classes, c) - if base_class: - handle_class(base_class) - - for clazz in _parse_stream_to_generator(f): - # Before looking at clazz, let's see if there's some classes that were not present, but - # may have an entry in the base stream. - handle_missed_classes_with_base(clazz) - - base_class = _skip_to_matching_class(base_classes, clazz) - if base_class: - clazz.merge_from(base_class) - if out_classes_with_base is not None: - out_classes_with_base.append(clazz) - handle_class(clazz) - - handle_missed_classes_with_base(None) - - return api - -def _parse_stream_to_generator(f): - line = 0 - pkg = None - clazz = None - blame = None - sig_format = 1 - - re_blame = re.compile(r"^(\^?[a-z0-9]{7,}) \(<([^>]+)>.+?\) (.+?)$") - - field_prefixes = map(lambda kind: " %s" % (kind,), V2LineParser.FIELD_KINDS) - def startsWithFieldPrefix(raw): - for prefix in field_prefixes: - if raw.startswith(prefix): - return True - return False - - for raw in f: - line += 1 - raw = raw.rstrip() - match = re_blame.match(raw) - if match is not None: - blame = match.groups()[0:2] - if blame[0].startswith("^"): # Outside of blame range - blame = None - raw = match.groups()[2] - else: - blame = None - - if line == 1 and V2Tokenizer.SIGNATURE_PREFIX in raw: - sig_format_string = raw[len(V2Tokenizer.SIGNATURE_PREFIX):] - if sig_format_string in ["2.0", "3.0"]: - sig_format = 2 - else: - raise ValueError("Unknown format: %s" % (sig_format_string,)) - elif raw.startswith("package"): - pkg = Package(line, raw, blame) - elif raw.startswith(" ") and raw.endswith("{"): - clazz = Class(pkg, line, raw, blame, sig_format=sig_format) - elif raw.startswith(" ctor"): - clazz.ctors.append(Method(clazz, line, raw, blame, sig_format=sig_format)) - elif raw.startswith(" method"): - clazz.methods.append(Method(clazz, line, raw, blame, sig_format=sig_format)) - elif startsWithFieldPrefix(raw): - clazz.fields.append(Field(clazz, line, raw, blame, sig_format=sig_format)) - elif raw.startswith(" }") and clazz: - yield clazz - -def _retry_iterator(it): - """Wraps an iterator, such that calling send(True) on it will redeliver the same element""" - for e in it: - while True: - retry = yield e - if not retry: - break - # send() was called, asking us to redeliver clazz on next(). Still need to yield - # a dummy value to the send() first though. - if (yield "Returning clazz on next()"): - raise TypeError("send() must be followed by next(), not send()") - -def _skip_to_matching_class(classes, needle): - """Takes a classes iterator and consumes entries until it returns the class we're looking for - - This relies on classes being sorted by package and class name.""" - - for clazz in classes: - if clazz.pkg.name < needle.pkg.name: - # We haven't reached the right package yet - continue - if clazz.pkg.name == needle.pkg.name and clazz.fullname < needle.fullname: - # We're in the right package, but not the right class yet - continue - if clazz.fullname == needle.fullname: - return clazz - # We ran past the right class. Send it back into the generator, then report failure. - classes.send(clazz) - return None - -def _yield_until_matching_class(classes, needle): - """Takes a class iterator and yields entries it until it reaches the class we're looking for. - - This relies on classes being sorted by package and class name.""" - - for clazz in classes: - if needle is None: - yield clazz - elif clazz.pkg.name < needle.pkg.name: - # We haven't reached the right package yet - yield clazz - elif clazz.pkg.name == needle.pkg.name and clazz.fullname < needle.fullname: - # We're in the right package, but not the right class yet - yield clazz - elif clazz.fullname == needle.fullname: - # Class found, abort. - return - else: - # We ran past the right class. Send it back into the iterator, then abort. - classes.send(clazz) - return - -class Failure(): - def __init__(self, sig, clazz, detail, error, rule, msg): - self.clazz = clazz - self.sig = sig - self.error = error - self.rule = rule - self.msg = msg - - if error: - self.head = "Error %s" % (rule) if rule else "Error" - dump = "%s%s:%s %s" % (format(fg=RED, bg=BLACK, bold=True), self.head, format(reset=True), msg) - else: - self.head = "Warning %s" % (rule) if rule else "Warning" - dump = "%s%s:%s %s" % (format(fg=YELLOW, bg=BLACK, bold=True), self.head, format(reset=True), msg) - - self.line = clazz.line - blame = clazz.blame - if detail is not None: - dump += "\n in " + repr(detail) - self.line = detail.line - blame = detail.blame - dump += "\n in " + repr(clazz) - dump += "\n in " + repr(clazz.pkg) - dump += "\n at line " + repr(self.line) - if blame is not None: - dump += "\n last modified by %s in %s" % (blame[1], blame[0]) - - self.dump = dump - - def __repr__(self): - return self.dump - - -failures = {} - -def _fail(clazz, detail, error, rule, msg): - """Records an API failure to be processed later.""" - global failures - - 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) - - -def warn(clazz, detail, rule, msg): - _fail(clazz, detail, False, rule, msg) - -def error(clazz, detail, rule, msg): - _fail(clazz, detail, True, rule, msg) - - -noticed = {} - -def notice(clazz): - global noticed - - noticed[clazz.fullname] = hash(clazz) - - -verifiers = {} - -def verifier(f): - verifiers[f.__name__] = f - return f - - -@verifier -def verify_constants(clazz): - """All static final constants must be FOO_NAME style.""" - if re.match("android\.R\.[a-z]+", clazz.fullname): return - if clazz.fullname.startswith("android.os.Build"): return - if clazz.fullname == "android.system.OsConstants": return - - req = ["java.lang.String","byte","short","int","long","float","double","boolean","char"] - for f in clazz.fields: - if "static" in f.split and "final" in f.split: - if re.match("[A-Z0-9_]+", f.name) is None: - error(clazz, f, "C2", "Constant field names must be FOO_NAME") - if f.typ != "java.lang.String": - if f.name.startswith("MIN_") or f.name.startswith("MAX_"): - warn(clazz, f, "C8", "If min/max could change in future, make them dynamic methods") - if f.typ in req and f.value is None: - error(clazz, f, None, "All constants must be defined at compile time") - -@verifier -def verify_enums(clazz): - """Enums are bad, mmkay?""" - if clazz.extends == "java.lang.Enum" or "enum" in clazz.split: - error(clazz, None, "F5", "Enums are not allowed") - -@verifier -def verify_class_names(clazz): - """Try catching malformed class names like myMtp or MTPUser.""" - if clazz.fullname.startswith("android.opengl"): return - if clazz.fullname.startswith("android.renderscript"): return - if re.match("android\.R\.[a-z]+", clazz.fullname): return - - if re.search("[A-Z]{2,}", clazz.name) is not None: - warn(clazz, None, "S1", "Class names with acronyms should be Mtp not MTP") - if re.match("[^A-Z]", clazz.name): - error(clazz, None, "S1", "Class must start with uppercase char") - if clazz.name.endswith("Impl"): - error(clazz, None, None, "Don't expose your implementation details") - - -@verifier -def verify_method_names(clazz): - """Try catching malformed method names, like Foo() or getMTU().""" - if clazz.fullname.startswith("android.opengl"): return - if clazz.fullname.startswith("android.renderscript"): return - if clazz.fullname == "android.system.OsConstants": return - - for m in clazz.methods: - if re.search("[A-Z]{2,}", m.name) is not None: - warn(clazz, m, "S1", "Method names with acronyms should be getMtu() instead of getMTU()") - if re.match("[^a-z]", m.name): - error(clazz, m, "S1", "Method name must start with lowercase char") - - -@verifier -def verify_callbacks(clazz): - """Verify Callback classes. - All methods must follow onFoo() naming style.""" - if clazz.fullname == "android.speech.tts.SynthesisCallback": return - - if clazz.name.endswith("Callbacks"): - error(clazz, None, "L1", "Callback class names should be singular") - if clazz.name.endswith("Observer"): - warn(clazz, None, "L1", "Class should be named FooCallback") - - if clazz.name.endswith("Callback"): - for m in clazz.methods: - if not re.match("on[A-Z][a-z]*", m.name): - error(clazz, m, "L1", "Callback method names must be onFoo() style") - - -@verifier -def verify_listeners(clazz): - """Verify Listener classes. - All Listener classes must be interface. - All methods must follow onFoo() naming style. - If only a single method, it must match class name: - interface OnFooListener { void onFoo() }""" - - if clazz.name.endswith("Listener"): - 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: - if not re.match("on[A-Z][a-z]*", m.name): - error(clazz, m, "L1", "Listener method names must be onFoo() style") - - if len(clazz.methods) == 1 and clazz.name.startswith("On"): - m = clazz.methods[0] - if (m.name + "Listener").lower() != clazz.name.lower(): - error(clazz, m, "L1", "Single listener method name must match class name") - - -@verifier -def verify_actions(clazz): - """Verify intent actions. - All action names must be named ACTION_FOO. - All action values must be scoped by package and match name: - package android.foo { - String ACTION_BAR = "android.foo.action.BAR"; - }""" - for f in clazz.fields: - if f.value is None: continue - if f.name.startswith("EXTRA_"): continue - if f.name == "SERVICE_INTERFACE" or f.name == "PROVIDER_INTERFACE": continue - if "INTERACTION" in f.name: continue - - if "static" in f.split and "final" in f.split and f.typ == "java.lang.String": - if "_ACTION" in f.name or "ACTION_" in f.name or ".action." in f.value.lower(): - if not f.name.startswith("ACTION_"): - error(clazz, f, "C3", "Intent action constant name must be ACTION_FOO") - else: - if clazz.fullname == "android.content.Intent": - prefix = "android.intent.action" - elif clazz.fullname == "android.provider.Settings": - prefix = "android.settings" - elif clazz.fullname == "android.app.admin.DevicePolicyManager" or clazz.fullname == "android.app.admin.DeviceAdminReceiver": - prefix = "android.app.action" - else: - prefix = clazz.pkg.name + ".action" - expected = prefix + "." + f.name[7:] - if f.value != expected: - error(clazz, f, "C4", "Inconsistent action value; expected '%s'" % (expected)) - - -@verifier -def verify_extras(clazz): - """Verify intent extras. - All extra names must be named EXTRA_FOO. - All extra values must be scoped by package and match name: - package android.foo { - String EXTRA_BAR = "android.foo.extra.BAR"; - }""" - if clazz.fullname == "android.app.Notification": return - if clazz.fullname == "android.appwidget.AppWidgetManager": return - - for f in clazz.fields: - if f.value is None: continue - if f.name.startswith("ACTION_"): continue - - if "static" in f.split and "final" in f.split and f.typ == "java.lang.String": - if "_EXTRA" in f.name or "EXTRA_" in f.name or ".extra" in f.value.lower(): - if not f.name.startswith("EXTRA_"): - error(clazz, f, "C3", "Intent extra must be EXTRA_FOO") - else: - if clazz.pkg.name == "android.content" and clazz.name == "Intent": - prefix = "android.intent.extra" - elif clazz.pkg.name == "android.app.admin": - prefix = "android.app.extra" - else: - prefix = clazz.pkg.name + ".extra" - expected = prefix + "." + f.name[6:] - if f.value != expected: - error(clazz, f, "C4", "Inconsistent extra value; expected '%s'" % (expected)) - - -@verifier -def verify_equals(clazz): - """Verify that equals() and hashCode() must be overridden together.""" - eq = False - hc = False - for m in clazz.methods: - 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") - - -@verifier -def verify_parcelable(clazz): - """Verify that Parcelable objects aren't hiding required bits.""" - 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" ] - - 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" not in clazz.split: - error(clazz, None, "FW8", "Parcelable classes must be final") - - for c in clazz.ctors: - if c.args == ["android.os.Parcel"]: - error(clazz, c, "FW3", "Parcelable inflation is exposed through CREATOR, not raw constructors") - - -@verifier -def verify_protected(clazz): - """Verify that no protected methods or fields are allowed.""" - for m in clazz.methods: - if m.name == "finalize": continue - if "protected" in m.split: - error(clazz, m, "M7", "Protected methods not allowed; must be public") - for f in clazz.fields: - if "protected" in f.split: - error(clazz, f, "M7", "Protected fields not allowed; must be public") - - -@verifier -def verify_fields(clazz): - """Verify that all exposed fields are final. - Exposed fields must follow myName style. - Catch internal mFoo objects being exposed.""" - - IGNORE_BARE_FIELDS = [ - "android.app.ActivityManager.RecentTaskInfo", - "android.app.Notification", - "android.content.pm.ActivityInfo", - "android.content.pm.ApplicationInfo", - "android.content.pm.ComponentInfo", - "android.content.pm.ResolveInfo", - "android.content.pm.FeatureGroupInfo", - "android.content.pm.InstrumentationInfo", - "android.content.pm.PackageInfo", - "android.content.pm.PackageItemInfo", - "android.content.res.Configuration", - "android.graphics.BitmapFactory.Options", - "android.os.Message", - "android.system.StructPollfd", - ] - - for f in clazz.fields: - if not "final" in f.split: - if clazz.fullname in IGNORE_BARE_FIELDS: - pass - elif clazz.fullname.endswith("LayoutParams"): - pass - elif clazz.fullname.startswith("android.util.Mutable"): - pass - else: - error(clazz, f, "F2", "Bare fields must be marked final, or add accessors if mutable") - - if "static" not in f.split and "property" not in f.split: - if not re.match("[a-z]([a-zA-Z]+)?", f.name): - error(clazz, f, "S1", "Non-static fields must be named using myField style") - - if re.match("[ms][A-Z]", f.name): - error(clazz, f, "F1", "Internal objects must not be exposed") - - if re.match("[A-Z_]+", f.name): - if "static" not in f.split or "final" not in f.split: - error(clazz, f, "C2", "Constants must be marked static final") - - -@verifier -def verify_register(clazz): - """Verify parity of registration methods. - Callback objects use register/unregister methods. - Listener objects use add/remove methods.""" - methods = [ m.name for m in clazz.methods ] - for m in clazz.methods: - if "Callback" in m.raw: - if m.name.startswith("register"): - other = "unregister" + m.name[8:] - if other not in methods: - error(clazz, m, "L2", "Missing unregister method") - if m.name.startswith("unregister"): - other = "register" + m.name[10:] - if other not in methods: - error(clazz, m, "L2", "Missing register method") - - if m.name.startswith("add") or m.name.startswith("remove"): - error(clazz, m, "L3", "Callback methods should be named register/unregister") - - if "Listener" in m.raw: - if m.name.startswith("add"): - other = "remove" + m.name[3:] - if other not in methods: - error(clazz, m, "L2", "Missing remove method") - if m.name.startswith("remove") and not m.name.startswith("removeAll"): - other = "add" + m.name[6:] - if other not in methods: - error(clazz, m, "L2", "Missing add method") - - if m.name.startswith("register") or m.name.startswith("unregister"): - error(clazz, m, "L3", "Listener methods should be named add/remove") - - -@verifier -def verify_sync(clazz): - """Verify synchronized methods aren't exposed.""" - for m in clazz.methods: - if "synchronized" in m.split: - error(clazz, m, "M5", "Internal locks must not be exposed") - - -@verifier -def verify_intent_builder(clazz): - """Verify that Intent builders are createFooIntent() style.""" - if clazz.name == "Intent": return - - for m in clazz.methods: - if m.typ == "android.content.Intent": - if m.name.startswith("create") and m.name.endswith("Intent"): - pass - else: - warn(clazz, m, "FW1", "Methods creating an Intent should be named createFooIntent()") - - -@verifier -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 clazz.extends == "android.app.Service": - test_methods = True - if not clazz.name.endswith("Service"): - error(clazz, None, "CL4", "Inconsistent class name; should be FooService") - - found = False - for f in clazz.fields: - if f.name == "SERVICE_INTERFACE": - found = True - if f.value != clazz.fullname: - error(clazz, f, "C4", "Inconsistent interface constant; expected '%s'" % (clazz.fullname)) - - 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") - - found = False - for f in clazz.fields: - if f.name == "PROVIDER_INTERFACE": - found = True - if f.value != clazz.fullname: - error(clazz, f, "C4", "Inconsistent interface constant; expected '%s'" % (clazz.fullname)) - - 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 clazz.extends == "android.app.Activity": - test_methods = True - if not clazz.name.endswith("Activity"): - error(clazz, None, "CL4", "Inconsistent class name; should be FooActivity") - - if test_methods: - for m in clazz.methods: - if "final" in m.split: continue - if not re.match("on[A-Z]", m.name): - if "abstract" in m.split: - warn(clazz, m, None, "Methods implemented by developers should be named onFoo()") - else: - warn(clazz, m, None, "If implemented by developer, should be named onFoo(); otherwise consider marking final") - - -@verifier -def verify_builder(clazz): - """Verify builder classes. - Methods should return the builder to enable chaining.""" - if clazz.extends: return - if not clazz.name.endswith("Builder"): return - - if clazz.name != "Builder": - warn(clazz, None, None, "Builder should be defined as inner class") - - has_build = False - for m in clazz.methods: - if m.name == "build": - has_build = True - continue - - if m.name.startswith("get"): continue - if m.name.startswith("clear"): continue - - if m.name.startswith("with"): - warn(clazz, m, None, "Builder methods names should use setFoo() style") - - if m.name.startswith("set"): - if not m.typ.endswith(clazz.fullname): - warn(clazz, m, "M4", "Methods must return the builder object") - - if not has_build: - warn(clazz, None, None, "Missing build() method") - - if "final" not in clazz.split: - error(clazz, None, None, "Builder should be final") - - -@verifier -def verify_aidl(clazz): - """Catch people exposing raw AIDL.""" - if clazz.extends == "android.os.Binder" or clazz.implements == "android.os.IInterface": - error(clazz, None, None, "Raw AIDL interfaces must not be exposed") - - -@verifier -def verify_internal(clazz): - """Catch people exposing internal classes.""" - 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" -]) - -@verifier -def verify_layering(clazz): - """Catch package layering violations. - For example, something in android.os depending on android.app.""" - - def rank(p): - 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: - break - return r - - cr = rank(clazz.pkg.name) - if cr is None: return - - for f in clazz.fields: - ir = rank(f.typ) - if ir is not None and ir < cr: - warn(clazz, f, "FW6", "Field type violates package layering") - - for m in itertools.chain(clazz.methods, clazz.ctors): - ir = rank(m.typ) - 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 is not None and ir < cr: - warn(clazz, m, "FW6", "Method argument type violates package layering") - - -@verifier -def verify_boolean(clazz): - """Verifies that boolean accessors are named correctly. - For example, hasFoo() and setHasFoo().""" - - def is_get(m): return len(m.args) == 0 and m.typ == "boolean" - def is_set(m): return len(m.args) == 1 and m.args[0] == "boolean" - - gets = [ m for m in clazz.methods if is_get(m) ] - sets = [ m for m in clazz.methods if is_set(m) ] - - def error_if_exists(methods, trigger, expected, actual): - for m in methods: - if m.name == actual: - error(clazz, m, "M6", "Symmetric method for %s must be named %s" % (trigger, expected)) - - for m in clazz.methods: - if is_get(m): - if re.match("is[A-Z]", m.name): - target = m.name[2:] - expected = "setIs" + target - error_if_exists(sets, m.name, expected, "setHas" + target) - elif re.match("has[A-Z]", m.name): - target = m.name[3:] - expected = "setHas" + target - error_if_exists(sets, m.name, expected, "setIs" + target) - error_if_exists(sets, m.name, expected, "set" + target) - elif re.match("get[A-Z]", m.name): - target = m.name[3:] - expected = "set" + target - error_if_exists(sets, m.name, expected, "setIs" + target) - error_if_exists(sets, m.name, expected, "setHas" + target) - - if is_set(m): - if re.match("set[A-Z]", m.name): - target = m.name[3:] - expected = "get" + target - error_if_exists(sets, m.name, expected, "is" + target) - error_if_exists(sets, m.name, expected, "has" + target) - - -@verifier -def verify_collections(clazz): - """Verifies that collection types are interfaces.""" - if clazz.fullname == "android.os.Bundle": return - if clazz.fullname == "android.os.Parcel": return - - bad = ["java.util.Vector", "java.util.LinkedList", "java.util.ArrayList", "java.util.Stack", - "java.util.HashMap", "java.util.HashSet", "android.util.ArraySet", "android.util.ArrayMap"] - for m in clazz.methods: - if m.typ in bad: - error(clazz, m, "CL2", "Return type is concrete collection; must be higher-level interface") - for arg in m.args: - if arg in bad: - error(clazz, m, "CL2", "Argument is concrete collection; must be higher-level interface") - - -@verifier -def verify_uris(clazz): - bad = ["java.net.URL", "java.net.URI", "android.net.URL"] - - for f in clazz.fields: - if f.typ in bad: - error(clazz, f, None, "Field must be android.net.Uri instead of " + f.typ) - - for m in clazz.methods + clazz.ctors: - if m.typ in bad: - error(clazz, m, None, "Must return android.net.Uri instead of " + m.typ) - for arg in m.args: - if arg in bad: - error(clazz, m, None, "Argument must take android.net.Uri instead of " + arg) - - -@verifier -def verify_flags(clazz): - """Verifies that flags are non-overlapping.""" - known = collections.defaultdict(int) - for f in clazz.fields: - if "FLAG_" in f.name: - try: - val = int(f.value) - except: - continue - - scope = f.name[0:f.name.index("FLAG_")] - if val & known[scope]: - warn(clazz, f, "C1", "Found overlapping flag constant value") - known[scope] |= val - - -@verifier -def verify_exception(clazz): - """Verifies that methods don't throw generic exceptions.""" - for m in clazz.methods: - for t in m.throws: - if t in ["java.lang.Exception", "java.lang.Throwable", "java.lang.Error"]: - error(clazz, m, "S1", "Methods must not throw generic exceptions") - - if t in ["android.os.RemoteException"]: - if clazz.fullname == "android.content.ContentProviderClient": continue - if clazz.fullname == "android.os.Binder": continue - if clazz.fullname == "android.os.IBinder": continue - - error(clazz, m, "FW9", "Methods calling into system server should rethrow RemoteException as RuntimeException") - - 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) - -# Not marked as @verifier, because it is only conditionally applied. -def verify_google(clazz): - """Verifies that APIs never reference Google.""" - - if GOOGLE_IGNORECASE.search(clazz.raw) is not None: - error(clazz, None, 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") - - -@verifier -def verify_bitset(clazz): - """Verifies that we avoid using heavy BitSet.""" - - for f in clazz.fields: - if f.typ == "java.util.BitSet": - error(clazz, f, None, "Field type must not be heavy BitSet") - - for m in clazz.methods: - if m.typ == "java.util.BitSet": - error(clazz, m, None, "Return type must not be heavy BitSet") - for arg in m.args: - if arg == "java.util.BitSet": - error(clazz, m, None, "Argument type must not be heavy BitSet") - - -@verifier -def verify_manager(clazz): - """Verifies that FooManager is only obtained from Context.""" - - if not clazz.name.endswith("Manager"): return - - for c in clazz.ctors: - error(clazz, c, None, "Managers must always be obtained from Context; no direct constructors") - - for m in clazz.methods: - if m.typ == clazz.fullname: - error(clazz, m, None, "Managers must always be obtained from Context") - - -@verifier -def verify_boxed(clazz): - """Verifies that methods avoid boxed primitives.""" - - boxed = ["java.lang.Number","java.lang.Byte","java.lang.Double","java.lang.Float","java.lang.Integer","java.lang.Long","java.lang.Short"] - - for c in clazz.ctors: - for arg in c.args: - if arg in boxed: - error(clazz, c, "M11", "Must avoid boxed primitives") - - for f in clazz.fields: - if f.typ in boxed: - error(clazz, f, "M11", "Must avoid boxed primitives") - - for m in clazz.methods: - if m.typ in boxed: - error(clazz, m, "M11", "Must avoid boxed primitives") - for arg in m.args: - if arg in boxed: - error(clazz, m, "M11", "Must avoid boxed primitives") - - -@verifier -def verify_static_utils(clazz): - """Verifies that helper classes can't be constructed.""" - if clazz.fullname.startswith("android.opengl"): return - if clazz.fullname.startswith("android.R"): return - - # Only care about classes with default constructors - if len(clazz.ctors) == 1 and len(clazz.ctors[0].args) == 0: - test = [] - test.extend(clazz.fields) - test.extend(clazz.methods) - - if len(test) == 0: return - for t in test: - if "static" not in t.split: - return - - error(clazz, None, None, "Fully-static utility classes must not have constructor") - - -# @verifier # Disabled for now -def verify_overload_args(clazz): - """Verifies that method overloads add new arguments at the end.""" - if clazz.fullname.startswith("android.opengl"): return - - overloads = collections.defaultdict(list) - for m in clazz.methods: - if "deprecated" in m.split: continue - overloads[m.name].append(m) - - for name, methods in overloads.items(): - if len(methods) <= 1: continue - - # Look for arguments common across all overloads - def cluster(args): - count = collections.defaultdict(int) - res = set() - for i in range(len(args)): - a = args[i] - res.add("%s#%d" % (a, count[a])) - count[a] += 1 - return res - - common_args = cluster(methods[0].args) - for m in methods: - common_args = common_args & cluster(m.args) - - if len(common_args) == 0: continue - - # Require that all common arguments are present at start of signature - locked_sig = None - for m in methods: - sig = m.args[0:len(common_args)] - if not common_args.issubset(cluster(sig)): - warn(clazz, m, "M2", "Expected common arguments [%s] at beginning of overloaded method" % (", ".join(common_args))) - elif not locked_sig: - locked_sig = sig - elif locked_sig != sig: - error(clazz, m, "M2", "Expected consistent argument ordering between overloads: %s..." % (", ".join(locked_sig))) - - -@verifier -def verify_callback_handlers(clazz): - """Verifies that methods adding listener/callback have overload - for specifying delivery thread.""" - - # Ignore UI packages which assume main thread - skip = [ - "animation", - "view", - "graphics", - "transition", - "widget", - "webkit", - ] - for s in skip: - if s in clazz.pkg.name_path: return - if s in clazz.extends_path: return - - # Ignore UI classes which assume main thread - if "app" in clazz.pkg.name_path or "app" in clazz.extends_path: - for s in ["ActionBar","Dialog","Application","Activity","Fragment","Loader"]: - if s in clazz.fullname: return - if "content" in clazz.pkg.name_path or "content" in clazz.extends_path: - for s in ["Loader"]: - if s in clazz.fullname: return - - found = {} - by_name = collections.defaultdict(list) - examine = clazz.ctors + clazz.methods - for m in examine: - if m.name.startswith("unregister"): continue - if m.name.startswith("remove"): continue - if re.match("on[A-Z]+", m.name): continue - - by_name[m.name].append(m) - - for a in m.args: - if a.endswith("Listener") or a.endswith("Callback") or a.endswith("Callbacks"): - found[m.name] = m - - for f in found.values(): - takes_handler = False - takes_exec = False - for m in by_name[f.name]: - if "android.os.Handler" in m.args: - takes_handler = True - if "java.util.concurrent.Executor" in m.args: - takes_exec = True - if not takes_exec: - warn(clazz, f, "L1", "Registration methods should have overload that accepts delivery Executor") - - -@verifier -def verify_context_first(clazz): - """Verifies that methods accepting a Context keep it the first argument.""" - examine = clazz.ctors + clazz.methods - for m in examine: - if len(m.args) > 1 and m.args[0] != "android.content.Context": - if "android.content.Context" in m.args[1:]: - error(clazz, m, "M3", "Context is distinct, so it must be the first argument") - if len(m.args) > 1 and m.args[0] != "android.content.ContentResolver": - if "android.content.ContentResolver" in m.args[1:]: - error(clazz, m, "M3", "ContentResolver is distinct, so it must be the first argument") - - -@verifier -def verify_listener_last(clazz): - """Verifies that methods accepting a Listener or Callback keep them as last arguments.""" - examine = clazz.ctors + clazz.methods - for m in examine: - if "Listener" in m.name or "Callback" in m.name: continue - found = False - for a in m.args: - if a.endswith("Callback") or a.endswith("Callbacks") or a.endswith("Listener"): - found = True - elif found: - warn(clazz, m, "M3", "Listeners should always be at end of argument list") - - -@verifier -def verify_resource_names(clazz): - """Verifies that resource names have consistent case.""" - if not re.match("android\.R\.[a-z]+", clazz.fullname): return - - # Resources defined by files are foo_bar_baz - if clazz.name in ["anim","animator","color","dimen","drawable","interpolator","layout","transition","menu","mipmap","string","plurals","raw","xml"]: - for f in clazz.fields: - if re.match("config_[a-z][a-zA-Z1-9]*$", f.name): continue - if f.name.startswith("config_"): - error(clazz, f, None, "Expected config name to be config_fooBarBaz style") - - if re.match("[a-z1-9_]+$", f.name): continue - error(clazz, f, None, "Expected resource name in this class to be foo_bar_baz style") - - # Resources defined inside files are fooBarBaz - if clazz.name in ["array","attr","id","bool","fraction","integer"]: - for f in clazz.fields: - if re.match("config_[a-z][a-zA-Z1-9]*$", f.name): continue - if re.match("layout_[a-z][a-zA-Z1-9]*$", f.name): continue - if re.match("state_[a-z_]*$", f.name): continue - - if re.match("[a-z][a-zA-Z1-9]*$", f.name): continue - error(clazz, f, "C7", "Expected resource name in this class to be fooBarBaz style") - - # Styles are FooBar_Baz - if clazz.name in ["style"]: - for f in clazz.fields: - if re.match("[A-Z][A-Za-z1-9]+(_[A-Z][A-Za-z1-9]+?)*$", f.name): continue - error(clazz, f, "C7", "Expected resource name in this class to be FooBar_Baz style") - - -@verifier -def verify_files(clazz): - """Verifies that methods accepting File also accept streams.""" - - has_file = set() - has_stream = set() - - test = [] - test.extend(clazz.ctors) - test.extend(clazz.methods) - - for m in test: - if "java.io.File" in m.args: - has_file.add(m) - if "java.io.FileDescriptor" in m.args or "android.os.ParcelFileDescriptor" in m.args or "java.io.InputStream" in m.args or "java.io.OutputStream" in m.args: - has_stream.add(m.name) - - for m in has_file: - if m.name not in has_stream: - warn(clazz, m, "M10", "Methods accepting File should also accept FileDescriptor or streams") - - -@verifier -def verify_manager_list(clazz): - """Verifies that managers return List<? extends Parcelable> instead of arrays.""" - - if not clazz.name.endswith("Manager"): return - - for m in clazz.methods: - if m.typ.startswith("android.") and m.typ.endswith("[]"): - warn(clazz, m, None, "Methods should return List<? extends Parcelable> instead of Parcelable[] to support ParceledListSlice under the hood") - - -@verifier -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.split and "static" not in clazz.split: - warn(clazz, None, None, "Abstract inner classes should be static to improve testability") - - -@verifier -def verify_runtime_exceptions(clazz): - """Verifies that runtime exceptions aren't listed in throws.""" - - banned = [ - "java.lang.NullPointerException", - "java.lang.ClassCastException", - "java.lang.IndexOutOfBoundsException", - "java.lang.reflect.UndeclaredThrowableException", - "java.lang.reflect.MalformedParametersException", - "java.lang.reflect.MalformedParameterizedTypeException", - "java.lang.invoke.WrongMethodTypeException", - "java.lang.EnumConstantNotPresentException", - "java.lang.IllegalMonitorStateException", - "java.lang.SecurityException", - "java.lang.UnsupportedOperationException", - "java.lang.annotation.AnnotationTypeMismatchException", - "java.lang.annotation.IncompleteAnnotationException", - "java.lang.TypeNotPresentException", - "java.lang.IllegalStateException", - "java.lang.ArithmeticException", - "java.lang.IllegalArgumentException", - "java.lang.ArrayStoreException", - "java.lang.NegativeArraySizeException", - "java.util.MissingResourceException", - "java.util.EmptyStackException", - "java.util.concurrent.CompletionException", - "java.util.concurrent.RejectedExecutionException", - "java.util.IllformedLocaleException", - "java.util.ConcurrentModificationException", - "java.util.NoSuchElementException", - "java.io.UncheckedIOException", - "java.time.DateTimeException", - "java.security.ProviderException", - "java.nio.BufferUnderflowException", - "java.nio.BufferOverflowException", - ] - - examine = clazz.ctors + clazz.methods - for m in examine: - for t in m.throws: - if t in banned: - error(clazz, m, None, "Methods must not mention RuntimeException subclasses in throws clauses") - - -@verifier -def verify_error(clazz): - """Verifies that we always use Exception instead of Error.""" - if not clazz.extends: return - if clazz.extends.endswith("Error"): - error(clazz, None, None, "Trouble must be reported through an Exception, not Error") - if clazz.extends.endswith("Exception") and not clazz.name.endswith("Exception"): - error(clazz, None, None, "Exceptions must be named FooException") - - -@verifier -def verify_units(clazz): - """Verifies that we use consistent naming for units.""" - - # If we find K, recommend replacing with V - bad = { - "Ns": "Nanos", - "Ms": "Millis or Micros", - "Sec": "Seconds", "Secs": "Seconds", - "Hr": "Hours", "Hrs": "Hours", - "Mo": "Months", "Mos": "Months", - "Yr": "Years", "Yrs": "Years", - "Byte": "Bytes", "Space": "Bytes", - } - - for m in clazz.methods: - if m.typ not in ["short","int","long"]: continue - for k, v in bad.iteritems(): - if m.name.endswith(k): - error(clazz, m, None, "Expected method name units to be " + v) - if m.name.endswith("Nanos") or m.name.endswith("Micros"): - warn(clazz, m, None, "Returned time values are strongly encouraged to be in milliseconds unless you need the extra precision") - if m.name.endswith("Seconds"): - error(clazz, m, None, "Returned time values must be in milliseconds") - - for m in clazz.methods: - typ = m.typ - if typ == "void": - if len(m.args) != 1: continue - typ = m.args[0] - - if m.name.endswith("Fraction") and typ != "float": - error(clazz, m, None, "Fractions must use floats") - if m.name.endswith("Percentage") and typ != "int": - error(clazz, m, None, "Percentage must use ints") - - -@verifier -def verify_closable(clazz): - """Verifies that classes are AutoClosable.""" - if "java.lang.AutoCloseable" in clazz.implements_all: return - if "java.io.Closeable" in clazz.implements_all: return - - for m in clazz.methods: - if len(m.args) > 0: continue - if m.name in ["close","release","destroy","finish","finalize","disconnect","shutdown","stop","free","quit"]: - warn(clazz, m, None, "Classes that release resources should implement AutoClosable and CloseGuard") - return - - -@verifier -def verify_member_name_not_kotlin_keyword(clazz): - """Prevent method names which are keywords in Kotlin.""" - - # https://kotlinlang.org/docs/reference/keyword-reference.html#hard-keywords - # This list does not include Java keywords as those are already impossible to use. - keywords = [ - 'as', - 'fun', - 'in', - 'is', - 'object', - 'typealias', - 'val', - 'var', - 'when', - ] - - for m in clazz.methods: - if m.name in keywords: - error(clazz, m, None, "Method name must not be a Kotlin keyword") - for f in clazz.fields: - if f.name in keywords: - error(clazz, f, None, "Field name must not be a Kotlin keyword") - - -@verifier -def verify_method_name_not_kotlin_operator(clazz): - """Warn about method names which become operators in Kotlin.""" - - binary = set() - - def unique_binary_op(m, op): - if op in binary: - error(clazz, m, None, "Only one of '{0}' and '{0}Assign' methods should be present for Kotlin".format(op)) - binary.add(op) - - for m in clazz.methods: - if 'static' in m.split or 'operator' in m.split: - continue - - # https://kotlinlang.org/docs/reference/operator-overloading.html#unary-prefix-operators - if m.name in ['unaryPlus', 'unaryMinus', 'not'] and len(m.args) == 0: - warn(clazz, m, None, "Method can be invoked as a unary operator from Kotlin") - - # https://kotlinlang.org/docs/reference/operator-overloading.html#increments-and-decrements - if m.name in ['inc', 'dec'] and len(m.args) == 0 and m.typ != 'void': - # This only applies if the return type is the same or a subtype of the enclosing class, but we have no - # practical way of checking that relationship here. - warn(clazz, m, None, "Method can be invoked as a pre/postfix inc/decrement operator from Kotlin") - - # https://kotlinlang.org/docs/reference/operator-overloading.html#arithmetic - if m.name in ['plus', 'minus', 'times', 'div', 'rem', 'mod', 'rangeTo'] and len(m.args) == 1: - warn(clazz, m, None, "Method can be invoked as a binary operator from Kotlin") - unique_binary_op(m, m.name) - - # https://kotlinlang.org/docs/reference/operator-overloading.html#in - if m.name == 'contains' and len(m.args) == 1 and m.typ == 'boolean': - warn(clazz, m, None, "Method can be invoked as a 'in' operator from Kotlin") - - # https://kotlinlang.org/docs/reference/operator-overloading.html#indexed - if (m.name == 'get' and len(m.args) > 0) or (m.name == 'set' and len(m.args) > 1): - warn(clazz, m, None, "Method can be invoked with an indexing operator from Kotlin") - - # https://kotlinlang.org/docs/reference/operator-overloading.html#invoke - if m.name == 'invoke': - warn(clazz, m, None, "Method can be invoked with function call syntax from Kotlin") - - # https://kotlinlang.org/docs/reference/operator-overloading.html#assignments - if m.name in ['plusAssign', 'minusAssign', 'timesAssign', 'divAssign', 'remAssign', 'modAssign'] \ - and len(m.args) == 1 \ - and m.typ == 'void': - warn(clazz, m, None, "Method can be invoked as a compound assignment operator from Kotlin") - unique_binary_op(m, m.name[:-6]) # Remove 'Assign' suffix - - -@verifier -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: - warn(clazz, m, None, "Method should return Collection<> (or subclass) instead of raw array") - for arg in m.args: - if arg.endswith("[]") and arg not in safe: - warn(clazz, m, None, "Method argument should be Collection<> (or subclass) instead of raw array") - - -@verifier -def verify_user_handle(clazz): - """Methods taking UserHandle should be ForUser or AsUser.""" - if clazz.name.endswith("Listener") or clazz.name.endswith("Callback") or clazz.name.endswith("Callbacks"): return - if clazz.fullname == "android.app.admin.DeviceAdminReceiver": return - if clazz.fullname == "android.content.pm.LauncherApps": return - if clazz.fullname == "android.os.UserHandle": return - if clazz.fullname == "android.os.UserManager": return - - for m in clazz.methods: - if re.match("on[A-Z]+", m.name): continue - - has_arg = "android.os.UserHandle" in m.args - has_name = m.name.endswith("AsUser") or m.name.endswith("ForUser") - - if clazz.fullname.endswith("Manager") and has_arg: - warn(clazz, m, None, "When a method overload is needed to target a specific " - "UserHandle, callers should be directed to use " - "Context.createPackageContextAsUser() and re-obtain the relevant " - "Manager, and no new API should be added") - elif has_arg and not has_name: - warn(clazz, m, None, "Method taking UserHandle should be named 'doFooAsUser' " - "or 'queryFooForUser'") - - -@verifier -def verify_params(clazz): - """Parameter classes should be 'Params'.""" - if clazz.name.endswith("Params"): return - if clazz.fullname == "android.app.ActivityOptions": return - if clazz.fullname == "android.app.BroadcastOptions": return - if clazz.fullname == "android.os.Bundle": return - if clazz.fullname == "android.os.BaseBundle": return - if clazz.fullname == "android.os.PersistableBundle": return - - bad = ["Param","Parameter","Parameters","Args","Arg","Argument","Arguments","Options","Bundle"] - for b in bad: - if clazz.name.endswith(b): - error(clazz, None, None, "Classes holding a set of parameters should be called 'FooParams'") - - -@verifier -def verify_services(clazz): - """Service name should be FOO_BAR_SERVICE = 'foo_bar'.""" - if clazz.fullname != "android.content.Context": return - - for f in clazz.fields: - if f.typ != "java.lang.String": continue - found = re.match(r"([A-Z_]+)_SERVICE", f.name) - if found: - expected = found.group(1).lower() - if f.value != expected: - error(clazz, f, "C4", "Inconsistent service value; expected '%s'" % (expected)) - - -@verifier -def verify_tense(clazz): - """Verify tenses of method names.""" - if clazz.fullname.startswith("android.opengl"): return - - for m in clazz.methods: - if m.name.endswith("Enable"): - warn(clazz, m, None, "Unexpected tense; probably meant 'enabled'") - - -@verifier -def verify_icu(clazz): - """Verifies that richer ICU replacements are used.""" - better = { - "java.util.TimeZone": "android.icu.util.TimeZone", - "java.util.Calendar": "android.icu.util.Calendar", - "java.util.Locale": "android.icu.util.ULocale", - "java.util.ResourceBundle": "android.icu.util.UResourceBundle", - "java.util.SimpleTimeZone": "android.icu.util.SimpleTimeZone", - "java.util.StringTokenizer": "android.icu.util.StringTokenizer", - "java.util.GregorianCalendar": "android.icu.util.GregorianCalendar", - "java.lang.Character": "android.icu.lang.UCharacter", - "java.text.BreakIterator": "android.icu.text.BreakIterator", - "java.text.Collator": "android.icu.text.Collator", - "java.text.DecimalFormatSymbols": "android.icu.text.DecimalFormatSymbols", - "java.text.NumberFormat": "android.icu.text.NumberFormat", - "java.text.DateFormatSymbols": "android.icu.text.DateFormatSymbols", - "java.text.DateFormat": "android.icu.text.DateFormat", - "java.text.SimpleDateFormat": "android.icu.text.SimpleDateFormat", - "java.text.MessageFormat": "android.icu.text.MessageFormat", - "java.text.DecimalFormat": "android.icu.text.DecimalFormat", - } - - for m in clazz.ctors + clazz.methods: - types = [] - types.extend(m.typ) - types.extend(m.args) - for arg in types: - if arg in better: - warn(clazz, m, None, "Type %s should be replaced with richer ICU type %s" % (arg, better[arg])) - - -@verifier -def verify_clone(clazz): - """Verify that clone() isn't implemented; see EJ page 61.""" - for m in clazz.methods: - if m.name == "clone": - error(clazz, m, None, "Provide an explicit copy constructor instead of implementing clone()") - - -@verifier -def verify_pfd(clazz): - """Verify that android APIs use PFD over FD.""" - if clazz.fullname == "android.os.FileUtils" or clazz.fullname == "android.system.Os": - return - - examine = clazz.ctors + clazz.methods - for m in examine: - if m.typ == "java.io.FileDescriptor": - error(clazz, m, "FW11", "Must use ParcelFileDescriptor") - if m.typ == "int": - if "Fd" in m.name or "FD" in m.name or "FileDescriptor" in m.name: - error(clazz, m, "FW11", "Must use ParcelFileDescriptor") - for arg in m.args: - if arg == "java.io.FileDescriptor": - error(clazz, m, "FW11", "Must use ParcelFileDescriptor") - - for f in clazz.fields: - if f.typ == "java.io.FileDescriptor": - error(clazz, f, "FW11", "Must use ParcelFileDescriptor") - - -@verifier -def verify_numbers(clazz): - """Discourage small numbers types like short and byte.""" - - discouraged = ["short","byte"] - - for c in clazz.ctors: - for arg in c.args: - if arg in discouraged: - warn(clazz, c, "FW12", "Should avoid odd sized primitives; use int instead") - - for f in clazz.fields: - if f.typ in discouraged: - warn(clazz, f, "FW12", "Should avoid odd sized primitives; use int instead") - - for m in clazz.methods: - if m.typ in discouraged: - warn(clazz, m, "FW12", "Should avoid odd sized primitives; use int instead") - for arg in m.args: - if arg in discouraged: - warn(clazz, m, "FW12", "Should avoid odd sized primitives; use int instead") - - -PRIMITIVES = {"void", "int", "float", "boolean", "short", "char", "byte", "long", "double"} - -@verifier -def verify_nullability(clazz): - """Catches missing nullability annotations""" - - for f in clazz.fields: - if "enum_constant" in f.split: - continue # Enum constants are never null - if f.value is not None and 'final' in f.split: - continue # Nullability of constants can be inferred. - if f.typ not in PRIMITIVES and not has_nullability(f.annotations): - error(clazz, f, "M12", "Field must be marked either @NonNull or @Nullable") - - for c in clazz.ctors: - verify_nullability_args(clazz, c) - - for m in clazz.methods: - if m.name == "writeToParcel" or m.name == "onReceive" or m.name == "onBind": - continue # Parcelable.writeToParcel(), BroadcastReceiver.onReceive(), and Service.onBind() are not yet annotated - - if (m.name == "equals" and m.args == ["java.lang.Object"] or - m.name == "toString" and m.args == []): - continue # Nullability of equals and toString is implicit. - - if m.typ not in PRIMITIVES and not has_nullability(m.annotations): - error(clazz, m, "M12", "Return value must be marked either @NonNull or @Nullable") - verify_nullability_args(clazz, m) - -def verify_nullability_args(clazz, m): - for i, arg in enumerate(m.detailed_args): - if arg.type not in PRIMITIVES and not has_nullability(arg.annotations): - error(clazz, m, "M12", "Argument %d must be marked either @NonNull or @Nullable" % (i+1,)) - -def has_nullability(annotations): - return "@NonNull" in annotations or "@Nullable" in annotations - - -@verifier -def verify_intdef(clazz): - """intdefs must be @hide, because the constant names cannot be stored in - the stubs (only the values are, which is not useful)""" - if "@interface" not in clazz.split: - return - if "@IntDef" in clazz.annotations or "@LongDef" in clazz.annotations: - error(clazz, None, None, "@IntDef and @LongDef annotations must be @hide") - - -@verifier -def verify_singleton(clazz): - """Catch singleton objects with constructors.""" - - singleton = False - for m in clazz.methods: - if m.name.startswith("get") and m.name.endswith("Instance") and " static " in m.raw: - singleton = True - - if singleton: - for c in clazz.ctors: - error(clazz, c, None, "Singleton classes should use getInstance() methods") - - - -def is_interesting(clazz): - """Test if given class is interesting from an Android PoV.""" - - if clazz.pkg.name.startswith("java"): return False - if clazz.pkg.name.startswith("junit"): return False - if clazz.pkg.name.startswith("org.apache"): return False - if clazz.pkg.name.startswith("org.xml"): return False - if clazz.pkg.name.startswith("org.json"): return False - if clazz.pkg.name.startswith("org.w3c"): return False - if clazz.pkg.name.startswith("android.icu."): return False - return True - - -def examine_clazz(clazz): - """Find all style issues in the given class.""" - - notice(clazz) - - if not is_interesting(clazz): return - - for v in verifiers.itervalues(): - v(clazz) - - if not ALLOW_GOOGLE: verify_google(clazz) - - -def examine_stream(stream, base_stream=None, in_classes_with_base=[], out_classes_with_base=None): - """Find all style issues in the given API stream.""" - global failures, noticed - failures = {} - noticed = {} - _parse_stream(stream, examine_clazz, base_f=base_stream, - in_classes_with_base=in_classes_with_base, - out_classes_with_base=out_classes_with_base) - return (failures, noticed) - - -def examine_api(api): - """Find all style issues in the given parsed API.""" - global failures - failures = {} - for key in sorted(api.keys()): - examine_clazz(api[key]) - return failures - - -def verify_compat(cur, prev): - """Find any incompatible API changes between two levels.""" - global failures - - def class_exists(api, test): - return test.fullname in api - - def ctor_exists(api, clazz, test): - for m in clazz.ctors: - if m.ident == test.ident: return True - return False - - def all_methods(api, clazz): - methods = list(clazz.methods) - if clazz.extends is not None: - methods.extend(all_methods(api, api[clazz.extends])) - return methods - - def method_exists(api, clazz, test): - methods = all_methods(api, clazz) - for m in methods: - if m.ident == test.ident: return True - return False - - def field_exists(api, clazz, test): - for f in clazz.fields: - if f.ident == test.ident: return True - return False - - failures = {} - for key in sorted(prev.keys()): - prev_clazz = prev[key] - - if not class_exists(cur, prev_clazz): - error(prev_clazz, None, None, "Class removed or incompatible change") - continue - - cur_clazz = cur[key] - - for test in prev_clazz.ctors: - if not ctor_exists(cur, cur_clazz, test): - error(prev_clazz, prev_ctor, None, "Constructor removed or incompatible change") - - methods = all_methods(prev, prev_clazz) - for test in methods: - if not method_exists(cur, cur_clazz, test): - error(prev_clazz, test, None, "Method removed or incompatible change") - - for test in prev_clazz.fields: - if not field_exists(cur, cur_clazz, test): - error(prev_clazz, test, None, "Field removed or incompatible change") - - return failures - - -def match_filter(filters, fullname): - for f in filters: - if fullname == f: - return True - if fullname.startswith(f + '.'): - return True - return False - - -def show_deprecations_at_birth(cur, prev): - """Show API deprecations at birth.""" - global failures - - # Remove all existing things so we're left with new - for prev_clazz in prev.values(): - if prev_clazz.fullname not in cur: - # The class was removed this release; we can safely ignore it. - continue - - cur_clazz = cur[prev_clazz.fullname] - if not is_interesting(cur_clazz): continue - - sigs = { i.ident: i for i in prev_clazz.ctors } - cur_clazz.ctors = [ i for i in cur_clazz.ctors if i.ident not in sigs ] - sigs = { i.ident: i for i in prev_clazz.methods } - cur_clazz.methods = [ i for i in cur_clazz.methods if i.ident not in sigs ] - sigs = { i.ident: i for i in prev_clazz.fields } - cur_clazz.fields = [ i for i in cur_clazz.fields if i.ident not in sigs ] - - # Forget about class entirely when nothing new - if len(cur_clazz.ctors) == 0 and len(cur_clazz.methods) == 0 and len(cur_clazz.fields) == 0: - del cur[prev_clazz.fullname] - - for clazz in cur.values(): - if not is_interesting(clazz): continue - - 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.split: - error(clazz, i, None, "Found API deprecation at birth") - - print "%s Deprecated at birth %s\n" % ((format(fg=WHITE, bg=BLUE, bold=True), - format(reset=True))) - for f in sorted(failures): - print failures[f] - print - - -def show_stats(cur, prev): - """Show API stats.""" - - stats = collections.defaultdict(int) - for cur_clazz in cur.values(): - if not is_interesting(cur_clazz): continue - - if cur_clazz.fullname not in prev: - stats['new_classes'] += 1 - stats['new_ctors'] += len(cur_clazz.ctors) - stats['new_methods'] += len(cur_clazz.methods) - stats['new_fields'] += len(cur_clazz.fields) - else: - prev_clazz = prev[cur_clazz.fullname] - - sigs = { i.ident: i for i in prev_clazz.ctors } - ctors = len([ i for i in cur_clazz.ctors if i.ident not in sigs ]) - sigs = { i.ident: i for i in prev_clazz.methods } - methods = len([ i for i in cur_clazz.methods if i.ident not in sigs ]) - sigs = { i.ident: i for i in prev_clazz.fields } - fields = len([ i for i in cur_clazz.fields if i.ident not in sigs ]) - - if ctors + methods + fields > 0: - stats['extend_classes'] += 1 - stats['extend_ctors'] += ctors - stats['extend_methods'] += methods - stats['extend_fields'] += fields - - print "#", "".join([ k.ljust(20) for k in sorted(stats.keys()) ]) - print " ", "".join([ str(stats[k]).ljust(20) for k in sorted(stats.keys()) ]) - - -def main(): - parser = argparse.ArgumentParser(description="Enforces common Android public API design \ - patterns. It ignores lint messages from a previous API level, if provided.") - parser.add_argument("--base-current", nargs='?', type=argparse.FileType('r'), default=None, - help="The base current.txt to use when examining system-current.txt or" - " test-current.txt") - parser.add_argument("--base-previous", nargs='?', type=argparse.FileType('r'), default=None, - help="The base previous.txt to use when examining system-previous.txt or" - " test-previous.txt") - parser.add_argument("--no-color", action='store_const', const=True, - help="Disable terminal colors") - parser.add_argument("--color", action='store_const', const=True, - help="Use terminal colors") - parser.add_argument("--allow-google", action='store_const', const=True, - help="Allow references to Google") - parser.add_argument("--show-noticed", action='store_const', const=True, - help="Show API changes noticed") - parser.add_argument("--show-deprecations-at-birth", action='store_const', const=True, - help="Show API deprecations at birth") - parser.add_argument("--show-stats", action='store_const', const=True, - help="Show API stats") - parser.add_argument("--title", action='store', default=None, - help="Title to put in for display purposes") - parser.add_argument("--filter", action="append", - help="If provided, only show lint for the given packages or classes.") - parser.add_argument("current.txt", type=argparse.FileType('r'), help="current.txt") - parser.add_argument("previous.txt", nargs='?', type=argparse.FileType('r'), default=None, - help="previous.txt") - args = vars(parser.parse_args()) - - if args['no_color']: - USE_COLOR = False - elif args['color']: - USE_COLOR = True - else: - USE_COLOR = sys.stdout.isatty() - - if args['allow_google']: - ALLOW_GOOGLE = True - - current_file = args['current.txt'] - base_current_file = args['base_current'] - previous_file = args['previous.txt'] - base_previous_file = args['base_previous'] - filters = args['filter'] - if not filters: - filters = [] - title = args['title'] - if not title: - title = current_file.name - - if args['show_deprecations_at_birth']: - with current_file as f: - cur = _parse_stream(f) - with previous_file as f: - prev = _parse_stream(f) - show_deprecations_at_birth(cur, prev) - sys.exit() - - if args['show_stats']: - with current_file as f: - cur = _parse_stream(f) - with previous_file as f: - prev = _parse_stream(f) - show_stats(cur, prev) - sys.exit() - - classes_with_base = [] - - with current_file as f: - if base_current_file: - with base_current_file as base_f: - cur_fail, cur_noticed = examine_stream(f, base_f, - out_classes_with_base=classes_with_base) - else: - cur_fail, cur_noticed = examine_stream(f, out_classes_with_base=classes_with_base) - - if not previous_file is None: - with previous_file as f: - if base_previous_file: - with base_previous_file as base_f: - prev_fail, prev_noticed = examine_stream(f, base_f, - in_classes_with_base=classes_with_base) - else: - prev_fail, prev_noticed = examine_stream(f, in_classes_with_base=classes_with_base) - - # ignore errors from previous API level - for p in prev_fail: - if p in cur_fail: - del cur_fail[p] - - # ignore classes unchanged from previous API level - for k, v in prev_noticed.iteritems(): - if k in cur_noticed and v == cur_noticed[k]: - del cur_noticed[k] - - """ - # NOTE: disabled because of memory pressure - # look for compatibility issues - compat_fail = verify_compat(cur, prev) - - print "%s API compatibility issues %s\n" % ((format(fg=WHITE, bg=BLUE, bold=True), format(reset=True))) - for f in sorted(compat_fail): - print compat_fail[f] - print - """ - - # ignore everything but the given filters, if provided - if filters: - cur_fail = dict([(key, failure) for key, failure in cur_fail.iteritems() - if match_filter(filters, failure.clazz.fullname)]) - - if args['show_noticed'] and len(cur_noticed) != 0: - print "%s API changes noticed %s\n" % ((format(fg=WHITE, bg=BLUE, bold=True), format(reset=True))) - for f in sorted(cur_noticed.keys()): - print f - print - - if len(cur_fail) != 0: - print "%s API style issues: %s %s" % ((format(fg=WHITE, bg=BLUE, bold=True), - title, format(reset=True))) - for f in filters: - print "%s filter: %s %s" % ((format(fg=WHITE, bg=BLUE, bold=True), - f, format(reset=True))) - print - for f in sorted(cur_fail): - print cur_fail[f] - print - print "%d errors" % len(cur_fail) - sys.exit(77) - -if __name__ == "__main__": - try: - main() - except KeyboardInterrupt: - sys.exit(1) diff --git a/tools/apilint/apilint_sha.sh b/tools/apilint/apilint_sha.sh deleted file mode 100755 index 2a45b10392d7..000000000000 --- a/tools/apilint/apilint_sha.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -if git show --name-only --pretty=format: $1 | grep api/ > /dev/null; then - python tools/apilint/apilint.py <(git show $1:api/current.txt) <(git show $1^:api/current.txt) -fi diff --git a/tools/apilint/apilint_sha_system.sh b/tools/apilint/apilint_sha_system.sh deleted file mode 100755 index 8538a3d904f5..000000000000 --- a/tools/apilint/apilint_sha_system.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# 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. - -if git show --name-only --pretty=format: $1 | grep api/ > /dev/null; then - python tools/apilint/apilint.py \ - --base-current <(git show $1:api/current.txt) \ - --base-previous <(git show $1^:api/current.txt) \ - <(git show $1:api/system-current.txt) \ - <(git show $1^:api/system-current.txt) -fi diff --git a/tools/apilint/apilint_stats.sh b/tools/apilint/apilint_stats.sh deleted file mode 100755 index 052d9a5265fe..000000000000 --- a/tools/apilint/apilint_stats.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -API=28 -while [ $API -gt 14 ]; do - echo "# Changes in API $((API))" - python tools/apilint/apilint.py --show-stats ../../prebuilts/sdk/$((API))/public/api/android.txt ../../prebuilts/sdk/$((API-1))/public/api/android.txt - let API=API-1 -done diff --git a/tools/apilint/apilint_test.py b/tools/apilint/apilint_test.py deleted file mode 100644 index 811cb9aa23d5..000000000000 --- a/tools/apilint/apilint_test.py +++ /dev/null @@ -1,414 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import unittest - -import apilint - -def cls(pkg, name): - return apilint.Class(apilint.Package(999, "package %s {" % pkg, None), 999, - "public final class %s {" % name, None) - -_ri = apilint._retry_iterator - -c1 = cls("android.app", "ActivityManager") -c2 = cls("android.app", "Notification") -c3 = cls("android.app", "Notification.Action") -c4 = cls("android.graphics", "Bitmap") - -class UtilTests(unittest.TestCase): - def test_retry_iterator(self): - it = apilint._retry_iterator([1, 2, 3, 4]) - self.assertEqual(it.next(), 1) - self.assertEqual(it.next(), 2) - self.assertEqual(it.next(), 3) - it.send("retry") - self.assertEqual(it.next(), 3) - self.assertEqual(it.next(), 4) - with self.assertRaises(StopIteration): - it.next() - - def test_retry_iterator_one(self): - it = apilint._retry_iterator([1]) - self.assertEqual(it.next(), 1) - it.send("retry") - self.assertEqual(it.next(), 1) - with self.assertRaises(StopIteration): - it.next() - - def test_retry_iterator_one(self): - it = apilint._retry_iterator([1]) - self.assertEqual(it.next(), 1) - it.send("retry") - self.assertEqual(it.next(), 1) - with self.assertRaises(StopIteration): - it.next() - - def test_skip_to_matching_class_found(self): - it = _ri([c1, c2, c3, c4]) - self.assertEquals(apilint._skip_to_matching_class(it, c3), - c3) - self.assertEqual(it.next(), c4) - - def test_skip_to_matching_class_not_found(self): - it = _ri([c1, c2, c3, c4]) - self.assertEquals(apilint._skip_to_matching_class(it, cls("android.content", "ContentProvider")), - None) - self.assertEqual(it.next(), c4) - - def test_yield_until_matching_class_found(self): - it = _ri([c1, c2, c3, c4]) - self.assertEquals(list(apilint._yield_until_matching_class(it, c3)), - [c1, c2]) - self.assertEqual(it.next(), c4) - - def test_yield_until_matching_class_not_found(self): - it = _ri([c1, c2, c3, c4]) - self.assertEquals(list(apilint._yield_until_matching_class(it, cls("android.content", "ContentProvider"))), - [c1, c2, c3]) - self.assertEqual(it.next(), c4) - - def test_yield_until_matching_class_None(self): - it = _ri([c1, c2, c3, c4]) - self.assertEquals(list(apilint._yield_until_matching_class(it, None)), - [c1, c2, c3, c4]) - - -faulty_current_txt = """ -// Signature format: 2.0 -package android.app { - public final class Activity { - } - - public final class WallpaperColors implements android.os.Parcelable { - ctor public WallpaperColors(@NonNull android.os.Parcel); - method public int describeContents(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator<android.app.WallpaperColors> CREATOR; - } -} -""".strip().split('\n') - -ok_current_txt = """ -// Signature format: 2.0 -package android.app { - public final class Activity { - } - - public final class WallpaperColors implements android.os.Parcelable { - ctor public WallpaperColors(); - method public int describeContents(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator<android.app.WallpaperColors> CREATOR; - } -} -""".strip().split('\n') - -system_current_txt = """ -// Signature format: 2.0 -package android.app { - public final class WallpaperColors implements android.os.Parcelable { - method public int getSomething(); - } -} -""".strip().split('\n') - - - -class BaseFileTests(unittest.TestCase): - def test_base_file_avoids_errors(self): - failures, _ = apilint.examine_stream(system_current_txt, ok_current_txt) - self.assertEquals(failures, {}) - - def test_class_with_base_finds_same_errors(self): - failures_with_classes_with_base, _ = apilint.examine_stream("", faulty_current_txt, - in_classes_with_base=[cls("android.app", "WallpaperColors")]) - failures_with_system_txt, _ = apilint.examine_stream(system_current_txt, faulty_current_txt) - - self.assertEquals(failures_with_classes_with_base.keys(), failures_with_system_txt.keys()) - - def test_classes_with_base_is_emited(self): - classes_with_base = [] - _, _ = apilint.examine_stream(system_current_txt, faulty_current_txt, - out_classes_with_base=classes_with_base) - self.assertEquals(map(lambda x: x.fullname, classes_with_base), ["android.app.WallpaperColors"]) - -class ParseV2Stream(unittest.TestCase): - def test_field_kinds(self): - api = apilint._parse_stream(""" -// Signature format: 2.0 -package android { - public enum SomeEnum { - enum_constant public static final android.SomeEnum ENUM_CONST; - field public static final int FIELD_CONST; - property public final int someProperty; - ctor public SomeEnum(); - method public Object? getObject(); - } -} - """.strip().split('\n')) - - self.assertEquals(api['android.SomeEnum'].fields[0].split[0], 'enum_constant') - self.assertEquals(api['android.SomeEnum'].fields[1].split[0], 'field') - self.assertEquals(api['android.SomeEnum'].fields[2].split[0], 'property') - self.assertEquals(api['android.SomeEnum'].ctors[0].split[0], 'ctor') - self.assertEquals(api['android.SomeEnum'].methods[0].split[0], 'method') - -class ParseV3Stream(unittest.TestCase): - def test_field_kinds(self): - api = apilint._parse_stream(""" -// Signature format: 3.0 -package a { - - public final class ContextKt { - method public static inline <reified T> T! getSystemService(android.content.Context); - method public static inline void withStyledAttributes(android.content.Context, android.util.AttributeSet? set = null, int[] attrs, @AttrRes int defStyleAttr = 0, @StyleRes int defStyleRes = 0, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block); - } -} - """.strip().split('\n')) - self.assertEquals(api['a.ContextKt'].methods[0].name, 'getSystemService') - self.assertEquals(api['a.ContextKt'].methods[0].split[:4], ['method', 'public', 'static', 'inline']) - self.assertEquals(api['a.ContextKt'].methods[1].name, 'withStyledAttributes') - self.assertEquals(api['a.ContextKt'].methods[1].split[:4], ['method', 'public', 'static', 'inline']) - -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_parse_package(self): - pkg = apilint.Package(999, "package wifi.p2p {", None) - self.assertEquals("wifi.p2p", pkg.name) - - 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_enum(self): - cls = self._cls("public enum Some.Name {") - self._field("enum_constant public static final android.ValueType COLOR;") - - 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 native <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('native' 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) - self._method('method abstract ViewDebug.FlagToString[] flagMapping() default (double)java.lang.Float.NEGATIVE_INFINITY;', 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');""") - - def test_kotlin_operator(self): - self._method('method public operator void unaryPlus(androidx.navigation.NavDestination);') - self._method('method public static operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);') - self._method('method public static operator <T> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);') - - def test_kotlin_property(self): - self._field('property public VM value;') - self._field('property public final String? action;') - - def test_kotlin_varargs(self): - self._method('method public void error(int p = "42", Integer int2 = "null", int p1 = "42", vararg String args);') - - def test_kotlin_default_values(self): - self._method('method public void foo(String! = null, String! = "Hello World", int = 42);') - self._method('method void method(String, String firstArg = "hello", int secondArg = "42", String thirdArg = "world");') - self._method('method void method(String, String firstArg = "hello", int secondArg = "42");') - self._method('method void method(String, String firstArg = "hello");') - self._method('method void edit(android.Type, boolean commit = false, Function1<? super Editor,kotlin.Unit> action);') - self._method('method <K, V> LruCache<K,V> lruCache(int maxSize, Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, Function1<? extends V> create = { (V)null }, Function4<kotlin.Unit> onEntryRemoved = { _, _, _, _ -> });') - self._method('method android.Bitmap? drawToBitmap(android.View, android.Config config = android.graphics.Bitmap.Config.ARGB_8888);') - self._method('method void emptyLambda(Function0<kotlin.Unit> sizeOf = {});') - self._method('method void method1(int p = 42, Integer? int2 = null, int p1 = 42, String str = "hello world", java.lang.String... args);') - self._method('method void method2(int p, int int2 = (2 * int) * some.other.pkg.Constants.Misc.SIZE);') - self._method('method void method3(String str, int p, int int2 = double(int) + str.length);') - self._method('method void print(test.pkg.Foo foo = test.pkg.Foo());') - - def test_type_use_annotation(self): - self._method('method public static int codePointAt(char @NonNull [], int);') - self._method('method @NonNull public java.util.Set<java.util.Map.@NonNull Entry<K,V>> entrySet();') - - m = self._method('method @NonNull public java.lang.annotation.@NonNull Annotation @NonNull [] getAnnotations();') - self.assertEquals('java.lang.annotation.Annotation[]', m.typ) - - m = self._method('method @NonNull public abstract java.lang.annotation.@NonNull Annotation @NonNull [] @NonNull [] getParameterAnnotations();') - self.assertEquals('java.lang.annotation.Annotation[][]', m.typ) - - m = self._method('method @NonNull public @NonNull String @NonNull [] split(@NonNull String, int);') - self.assertEquals('java.lang.String[]', m.typ) - -class PackageTests(unittest.TestCase): - def _package(self, raw): - return apilint.Package(123, raw, "blame") - - def test_regular_package(self): - p = self._package("package an.pref.int {") - self.assertEquals('an.pref.int', p.name) - - def test_annotation_package(self): - p = self._package("package @RestrictTo(a.b.C) an.pref.int {") - self.assertEquals('an.pref.int', p.name) - - def test_multi_annotation_package(self): - p = self._package("package @Rt(a.b.L_G_P) @RestrictTo(a.b.C) an.pref.int {") - self.assertEquals('an.pref.int', p.name) - -class FilterTests(unittest.TestCase): - def test_filter_match_prefix(self): - self.assertTrue(apilint.match_filter(["a"], "a.B")) - self.assertTrue(apilint.match_filter(["a.B"], "a.B.C")) - - def test_filter_dont_match_prefix(self): - self.assertFalse(apilint.match_filter(["c"], "a.B")) - self.assertFalse(apilint.match_filter(["a."], "a.B")) - self.assertFalse(apilint.match_filter(["a.B."], "a.B.C")) - - def test_filter_match_exact(self): - self.assertTrue(apilint.match_filter(["a.B"], "a.B")) - - def test_filter_dont_match_exact(self): - self.assertFalse(apilint.match_filter([""], "a.B")) - self.assertFalse(apilint.match_filter(["a.C"], "a.B")) - self.assertFalse(apilint.match_filter(["a.C"], "a.B")) - -if __name__ == "__main__": - unittest.main() |