Import Support Library, AndroidX from build 4822107 am: f857da9b45
am: 4281db3eac
Change-Id: I5ddad6cb3b6d02d4329eb96c493454c45ff6815f
diff --git a/28/public/api/android.txt b/28/public/api/android.txt
index 26e4298..d41372b 100644
--- a/28/public/api/android.txt
+++ b/28/public/api/android.txt
@@ -14187,13 +14187,11 @@
ctor public Picture();
ctor public Picture(android.graphics.Picture);
method public android.graphics.Canvas beginRecording(int, int);
- method public static deprecated android.graphics.Picture createFromStream(java.io.InputStream);
method public void draw(android.graphics.Canvas);
method public void endRecording();
method public int getHeight();
method public int getWidth();
method public boolean requiresHardwareAcceleration();
- method public deprecated void writeToStream(java.io.OutputStream);
}
public class PixelFormat {
diff --git a/28/public/api/com.android.mediadrm.signer-removed.txt b/28/public/api/com.android.mediadrm.signer-removed.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/public/api/com.android.mediadrm.signer-removed.txt
diff --git a/28/public/api/com.android.mediadrm.signer.txt b/28/public/api/com.android.mediadrm.signer.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/public/api/com.android.mediadrm.signer.txt
diff --git a/28/system/api/com.android.mediadrm.signer-removed.txt b/28/system/api/com.android.mediadrm.signer-removed.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/system/api/com.android.mediadrm.signer-removed.txt
diff --git a/28/system/api/com.android.mediadrm.signer.txt b/28/system/api/com.android.mediadrm.signer.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/system/api/com.android.mediadrm.signer.txt
diff --git a/28/test/api/com.android.mediadrm.signer-removed.txt b/28/test/api/com.android.mediadrm.signer-removed.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/test/api/com.android.mediadrm.signer-removed.txt
diff --git a/28/test/api/com.android.mediadrm.signer.txt b/28/test/api/com.android.mediadrm.signer.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/test/api/com.android.mediadrm.signer.txt
diff --git a/current/core/android.jar b/current/core/android.jar
index cc5fc8c..66a85b3 100644
--- a/current/core/android.jar
+++ b/current/core/android.jar
Binary files differ
diff --git a/current/definitions.mk b/current/definitions.mk
index b12c113..c71c0de 100644
--- a/current/definitions.mk
+++ b/current/definitions.mk
@@ -63,3 +63,4 @@
# android-support-car.
ANDROID_SUPPORT_CAR_TARGETS := \
android-support-car
+
diff --git a/current/public/android.jar b/current/public/android.jar
index 5409c26..3022665 100644
--- a/current/public/android.jar
+++ b/current/public/android.jar
Binary files differ
diff --git a/current/public/android.test.base.jar b/current/public/android.test.base.jar
index e765455..cf3a871 100644
--- a/current/public/android.test.base.jar
+++ b/current/public/android.test.base.jar
Binary files differ
diff --git a/current/public/android.test.mock.jar b/current/public/android.test.mock.jar
index dedea5e..7406bc7 100644
--- a/current/public/android.test.mock.jar
+++ b/current/public/android.test.mock.jar
Binary files differ
diff --git a/current/public/android.test.runner.jar b/current/public/android.test.runner.jar
index 9750a80..973a948 100644
--- a/current/public/android.test.runner.jar
+++ b/current/public/android.test.runner.jar
Binary files differ
diff --git a/current/public/framework.aidl b/current/public/framework.aidl
index 4caa50e..1f81087 100644
--- a/current/public/framework.aidl
+++ b/current/public/framework.aidl
@@ -15,18 +15,19 @@
parcelable android.app.AutomaticZenRule;
parcelable android.app.Fragment.SavedState;
parcelable android.app.Notification.Action;
-parcelable android.app.Notification.Person;
parcelable android.app.Notification;
parcelable android.app.NotificationChannel;
parcelable android.app.NotificationChannelGroup;
parcelable android.app.NotificationManager.Policy;
parcelable android.app.PendingIntent;
+parcelable android.app.Person;
parcelable android.app.PictureInPictureParams;
parcelable android.app.RemoteAction;
parcelable android.app.RemoteInput;
parcelable android.app.SearchableInfo;
parcelable android.app.VoiceInteractor.PickOptionRequest.Option;
parcelable android.app.VoiceInteractor.Prompt;
+parcelable android.app.Vr2dDisplayProperties;
parcelable android.app.WallpaperColors;
parcelable android.app.WallpaperInfo;
parcelable android.app.WindowConfiguration;
@@ -124,6 +125,7 @@
parcelable android.content.pm.SharedLibraryInfo;
parcelable android.content.pm.ShortcutInfo;
parcelable android.content.pm.Signature;
+parcelable android.content.pm.SigningInfo;
parcelable android.content.pm.VersionedPackage;
parcelable android.content.pm.permission.RuntimePermissionPresentationInfo;
parcelable android.content.res.AssetFileDescriptor;
@@ -195,6 +197,7 @@
parcelable android.media.AudioFormat;
parcelable android.media.AudioPlaybackConfiguration;
parcelable android.media.AudioRecordingConfiguration;
+parcelable android.media.BufferingParams;
parcelable android.media.MediaDescription;
parcelable android.media.MediaMetadata;
parcelable android.media.MediaPlayer.TrackInfo;
@@ -296,6 +299,9 @@
parcelable android.os.StrictMode.ViolationInfo;
parcelable android.os.UserHandle;
parcelable android.os.UserManager.EnforcingUser;
+parcelable android.os.VibrationEffect.OneShot;
+parcelable android.os.VibrationEffect.Prebaked;
+parcelable android.os.VibrationEffect.Waveform;
parcelable android.os.VibrationEffect;
parcelable android.os.WorkSource.WorkChain;
parcelable android.os.WorkSource;
@@ -480,14 +486,15 @@
parcelable android.view.inputmethod.InputMethodInfo;
parcelable android.view.inputmethod.InputMethodSubtype;
parcelable android.view.textclassifier.SelectionEvent;
-parcelable android.view.textclassifier.TextClassification.Options;
+parcelable android.view.textclassifier.TextClassification.Request;
parcelable android.view.textclassifier.TextClassification;
+parcelable android.view.textclassifier.TextClassificationContext;
parcelable android.view.textclassifier.TextClassificationSessionId;
parcelable android.view.textclassifier.TextClassifier.EntityConfig;
-parcelable android.view.textclassifier.TextLinks.Options;
+parcelable android.view.textclassifier.TextLinks.Request;
parcelable android.view.textclassifier.TextLinks.TextLink;
parcelable android.view.textclassifier.TextLinks;
-parcelable android.view.textclassifier.TextSelection.Options;
+parcelable android.view.textclassifier.TextSelection.Request;
parcelable android.view.textclassifier.TextSelection;
parcelable android.view.textservice.SentenceSuggestionsInfo;
parcelable android.view.textservice.SpellCheckerInfo;
diff --git a/current/public/org.apache.http.legacy.jar b/current/public/org.apache.http.legacy.jar
index 3f09fcb..5c3f0eb 100644
--- a/current/public/org.apache.http.legacy.jar
+++ b/current/public/org.apache.http.legacy.jar
Binary files differ
diff --git a/current/public/uiautomator.jar b/current/public/uiautomator.jar
index 6da538a..e350c07 100644
--- a/current/public/uiautomator.jar
+++ b/current/public/uiautomator.jar
Binary files differ
diff --git a/current/system/android.jar b/current/system/android.jar
index 0568186..8661a21 100644
--- a/current/system/android.jar
+++ b/current/system/android.jar
Binary files differ
diff --git a/current/system/android.test.mock.jar b/current/system/android.test.mock.jar
index 4a43346..90bdd77 100644
--- a/current/system/android.test.mock.jar
+++ b/current/system/android.test.mock.jar
Binary files differ
diff --git a/renderscript/Android.mk b/renderscript/Android.mk
index 2528e43..fb4b043 100644
--- a/renderscript/Android.mk
+++ b/renderscript/Android.mk
@@ -66,5 +66,19 @@
include $(BUILD_PREBUILT)
##################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := android-support-v8-renderscript-legacy
+LOCAL_SRC_FILES := lib/javalib_legacy.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .jar
+LOCAL_UNINSTALLABLE_MODULE := true
+# 23 as specified at frameworks/rs/support/Android.mk
+LOCAL_SDK_VERSION := 23
+
+include $(BUILD_PREBUILT)
+
+##################################
endif # TARGET_BUILD_APPS
diff --git a/renderscript/lib/javalib.jar b/renderscript/lib/javalib.jar
index 6ec52ee..a9aaf06 100644
--- a/renderscript/lib/javalib.jar
+++ b/renderscript/lib/javalib.jar
Binary files differ
diff --git a/renderscript/lib/javalib_legacy.jar b/renderscript/lib/javalib_legacy.jar
new file mode 100644
index 0000000..6ec52ee
--- /dev/null
+++ b/renderscript/lib/javalib_legacy.jar
Binary files differ
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index 9c8674b..7bbf293 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -12,7 +12,7 @@
from functools import reduce
current_path = 'current'
-framework_sdk_target = 'sdk_mac'
+framework_sdk_target = 'sdk_phone_armv7-sdk_mac'
support_dir = os.path.join(current_path, 'support')
androidx_dir = os.path.join(current_path, 'androidx')
extras_dir = os.path.join(current_path, 'extras')
@@ -653,10 +653,14 @@
'core.current.stubs.jar': 'android.jar',
},
'public': {
+ 'android.test.base.stubs.jar': 'android.test.base.jar',
+ 'android.test.runner.stubs.jar': 'android.test.runner.jar',
+ 'android.test.mock.stubs.jar': 'android.test.mock.jar',
'apistubs/public/*.jar': '*',
},
'system': {
'android_system.jar': 'android.jar',
+ 'android.test.mock.stubs_system.jar': 'android.test.mock.jar',
'apistubs/system/*.jar': '*',
},
'test': {