Merge cherrypicks of [3817848, 3817849, 3817850, 3817851] into pi-release (8cc1cf74) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+24 −0

Original line number	Diff line number	Diff line
		Landroid/accounts/AccountManager;->mContext:Landroid/content/Context;
		Landroid/accounts/IAccountAuthenticatorResponse$Stub;-><init>()V
		Landroid/accounts/IAccountManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountManager;
		Landroid/accounts/IAccountManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/animation/LayoutTransition;->cancel()V
		@@ -236,6 +237,7 @@ Landroid/app/IActivityManager;->getLaunchedFromPackage(Landroid/os/IBinder;)Ljav
		Landroid/app/IActivityManager;->getTaskForActivity(Landroid/os/IBinder;Z)I
		Landroid/app/IActivityManager;->moveTaskToFront(IILandroid/os/Bundle;)V
		Landroid/app/IActivityManager;->publishContentProviders(Landroid/app/IApplicationThread;Ljava/util/List;)V
		Landroid/app/IActivityManager;->requestBugReport(I)V
		Landroid/app/IActivityManager;->resumeAppSwitches()V
		Landroid/app/IActivityManager;->setRequestedOrientation(Landroid/os/IBinder;I)V
		Landroid/app/IActivityManager;->setTaskResizeable(II)V
		@@ -609,6 +611,11 @@ Landroid/graphics/Bitmap;->reinit(IIZ)V
		Landroid/graphics/Camera;->native_instance:J
		Landroid/graphics/Canvas;-><init>(J)V
		Landroid/graphics/Canvas;->release()V
		Landroid/graphics/Canvas;->save(I)I
		Landroid/graphics/Canvas;->saveLayer(Landroid/graphics/RectF;Landroid/graphics/Paint;I)I
		Landroid/graphics/Canvas;->saveLayer(FFFFLandroid/graphics/Paint;I)I
		Landroid/graphics/Canvas;->saveLayerAlpha(Landroid/graphics/RectF;II)I
		Landroid/graphics/Canvas;->saveLayerAlpha(FFFFII)I
		Landroid/graphics/ColorMatrixColorFilter;->setColorMatrix(Landroid/graphics/ColorMatrix;)V
		Landroid/graphics/drawable/AnimatedImageDrawable;->onAnimationEnd()V
		Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;->mStateIds:Landroid/util/SparseIntArray;
		@@ -943,6 +950,7 @@ Landroid/media/IAudioService;->getStreamVolume(I)I
		Landroid/media/IAudioService;->setStreamVolume(IIILjava/lang/String;)V
		Landroid/media/IAudioService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IAudioService;
		Landroid/media/IAudioService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/media/IRemoteDisplayCallback;->onStateChanged(Landroid/media/RemoteDisplayState;)V
		Landroid/media/IVolumeController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IVolumeController;
		Landroid/media/JetPlayer;->mNativePlayerInJavaObj:J
		Landroid/media/JetPlayer;->postEventFromNative(Ljava/lang/Object;III)V
		@@ -995,6 +1003,8 @@ Landroid/media/PlaybackParams;->SET_SPEED:I
		Landroid/media/RemoteDisplay;->notifyDisplayConnected(Landroid/view/Surface;IIII)V
		Landroid/media/RemoteDisplay;->notifyDisplayDisconnected()V
		Landroid/media/RemoteDisplay;->notifyDisplayError(I)V
		Landroid/media/RemoteDisplayState;->displays:Ljava/util/ArrayList;
		Landroid/media/RemoteDisplayState;-><init>()V
		Landroid/media/RingtoneManager;->getRingtone(Landroid/content/Context;Landroid/net/Uri;I)Landroid/media/Ringtone;
		Landroid/media/session/MediaSessionLegacyHelper;->getHelper(Landroid/content/Context;)Landroid/media/session/MediaSessionLegacyHelper;
		Landroid/media/session/MediaSession;->mCallback:Landroid/media/session/MediaSession$CallbackMessageHandler;
		@@ -1006,6 +1016,11 @@ Landroid/media/soundtrigger/SoundTriggerManager;->startRecognition(Ljava/util/UU
		Landroid/media/soundtrigger/SoundTriggerManager;->stopRecognition(Ljava/util/UUID;)I
		Landroid/media/soundtrigger/SoundTriggerManager;->unloadSoundModel(Ljava/util/UUID;)I
		Landroid/media/SubtitleController;->mHandler:Landroid/os/Handler;
		Landroid/media/SubtitleTrack$RenderingWidget;->draw(Landroid/graphics/Canvas;)V
		Landroid/media/SubtitleTrack$RenderingWidget;->onAttachedToWindow()V
		Landroid/media/SubtitleTrack$RenderingWidget;->onDetachedFromWindow()V
		Landroid/media/SubtitleTrack$RenderingWidget;->setOnChangedListener(Landroid/media/SubtitleTrack$RenderingWidget$OnChangedListener;)V
		Landroid/media/SubtitleTrack$RenderingWidget;->setSize(II)V
		Landroid/media/ThumbnailUtils;->createImageThumbnail(Ljava/lang/String;I)Landroid/graphics/Bitmap;
		Landroid/media/ToneGenerator;->mNativeContext:J
		Landroid/media/VolumeShaper$Configuration;-><init>(IIIDI[F[F)V
		@@ -1961,6 +1976,7 @@ Landroid/util/Rational;->mDenominator:I
		Landroid/util/Rational;->mNumerator:I
		Landroid/util/Singleton;->mInstance:Ljava/lang/Object;
		Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I
		Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
		Landroid/util/SparseIntArray;->mKeys:[I
		Landroid/util/SparseIntArray;->mSize:I
		Landroid/util/SparseIntArray;->mValues:[I
		@@ -2280,6 +2296,7 @@ Landroid/view/Window;->mHardwareAccelerated:Z
		Landroid/webkit/IWebViewUpdateService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/webkit/WebResourceResponse;->mImmutable:Z
		Landroid/webkit/WebSyncManager;->mHandler:Landroid/os/Handler;
		Landroid/webkit/WebViewClient;->onUnhandledInputEvent(Landroid/webkit/WebView;Landroid/view/InputEvent;)V
		Landroid/webkit/WebView;->debugDump()V
		Landroid/webkit/WebView;->disablePlatformNotifications()V
		Landroid/webkit/WebView;->emulateShiftHeld()V
		@@ -2709,11 +2726,15 @@ Lcom/android/internal/R$styleable;->CheckBoxPreference_summaryOff:I
		Lcom/android/internal/R$styleable;->CheckBoxPreference_summaryOn:I
		Lcom/android/internal/R$styleable;->CompoundButton_button:I
		Lcom/android/internal/R$styleable;->CompoundButton:[I
		Lcom/android/internal/R$styleable;->DialogPreference_dialogTitle:I
		Lcom/android/internal/R$styleable;->DialogPreference:[I
		Lcom/android/internal/R$styleable;->EdgeEffect_colorEdgeEffect:I
		Lcom/android/internal/R$styleable;->EdgeEffect:[I
		Lcom/android/internal/R$styleable;->IconMenuView:[I
		Lcom/android/internal/R$styleable;->ImageView:[I
		Lcom/android/internal/R$styleable;->ImageView_src:I
		Lcom/android/internal/R$styleable;->ListPreference_entries:I
		Lcom/android/internal/R$styleable;->ListPreference:[I
		Lcom/android/internal/R$styleable;->Preference_defaultValue:I
		Lcom/android/internal/R$styleable;->Preference_dependency:I
		Lcom/android/internal/R$styleable;->Preference_enabled:I
		@@ -2955,6 +2976,7 @@ Ljava/lang/Runtime;->load(Ljava/lang/String;Ljava/lang/ClassLoader;)V
		Ljava/lang/Runtime;->nativeLoad(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String;
		Ljava/lang/Short;->value:S
		Ljava/lang/String;-><init>(II[C)V
		Ljava/lang/System;->arraycopy([II[III)V
		Ljava/lang/System;-><init>()V
		Ljava/lang/Thread;->daemon:Z
		Ljava/lang/Thread;->dispatchUncaughtException(Ljava/lang/Throwable;)V
		@@ -3066,5 +3088,7 @@ Llibcore/util/ZoneInfo;->mTransitions:[J
		Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>(Ljavax/net/ssl/SSLSocketFactory;)V
		Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>()V
		Lorg/json/JSONArray;->values:Ljava/util/List;
		Lorg/json/JSONObject;->append(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
		Lorg/json/JSONObject;->keySet()Ljava/util/Set;
		Lorg/json/JSONObject;->writeTo(Lorg/json/JSONStringer;)V
		Lsun/misc/Unsafe;->theUnsafe:Lsun/misc/Unsafe;

config/hiddenapi-vendor-list.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ Landroid/app/IActivityManager;->getRunningAppProcesses()Ljava/util/List;
		Landroid/app/IActivityManager;->getTaskSnapshot(IZ)Landroid/app/ActivityManager$TaskSnapshot;
		Landroid/app/IActivityManager;->registerTaskStackListener(Landroid/app/ITaskStackListener;)V
		Landroid/app/IActivityManager;->removeTask(I)Z
		Landroid/app/IActivityManager;->requestBugReport(I)V
		Landroid/app/IActivityManager;->startActivityAsUser(Landroid/app/IApplicationThread;Ljava/lang/String;Landroid/content/Intent;Ljava/lang/String;Landroid/os/IBinder;Ljava/lang/String;IILandroid/app/ProfilerInfo;Landroid/os/Bundle;I)I
		Landroid/app/IActivityManager;->startActivityFromRecents(ILandroid/os/Bundle;)I
		Landroid/app/IActivityManager;->startActivity(Landroid/app/IApplicationThread;Ljava/lang/String;Landroid/content/Intent;Ljava/lang/String;Landroid/os/IBinder;Ljava/lang/String;IILandroid/app/ProfilerInfo;Landroid/os/Bundle;)I
		@@ -108,11 +107,6 @@ Landroid/graphics/Bitmap;->createGraphicBufferHandle()Landroid/graphics/GraphicB
		Landroid/graphics/Bitmap;->createHardwareBitmap(Landroid/graphics/GraphicBuffer;)Landroid/graphics/Bitmap;
		Landroid/graphics/Canvas;->clipRegion(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
		Landroid/graphics/Canvas;->clipRegion(Landroid/graphics/Region;)Z
		Landroid/graphics/Canvas;->save(I)I
		Landroid/graphics/Canvas;->saveLayerAlpha(FFFFII)I
		Landroid/graphics/Canvas;->saveLayerAlpha(Landroid/graphics/RectF;II)I
		Landroid/graphics/Canvas;->saveLayer(FFFFLandroid/graphics/Paint;I)I
		Landroid/graphics/Canvas;->saveLayer(Landroid/graphics/RectF;Landroid/graphics/Paint;I)I
		Landroid/graphics/drawable/Drawable;->isProjected()Z
		Landroid/graphics/drawable/Drawable;->updateTintFilter(Landroid/graphics/PorterDuffColorFilter;Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
		Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V

core/java/com/android/internal/widget/LockPatternView.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -1008,9 +1008,6 @@ public class LockPatternView extends View {
		mDrawingProfilingStarted = false;
		}
		}
		if (mFadePattern) {
		clearPattern();
		}
		}

		private void cancelLineAnimations() {

core/res/res/values-land/dimens.xml

+1 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,7 @@

		<!-- Height of the status bar -->
		<dimen name="status_bar_height">@dimen/status_bar_height_landscape</dimen>
		<!-- Height of area above QQS where battery/time go -->
		<dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
		<!-- Total height of QQS in landscape, this is effectively status_bar_height_landscape + 128 -->
		<dimen name="quick_qs_total_height">152dp</dimen>

		<!-- Default height of an action bar. -->
		<dimen name="action_bar_default_height">40dip</dimen>
		<!-- Vertical padding around action bar icons. -->

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -1670,7 +1670,6 @@
		<java-symbol type="dimen" name="navigation_bar_height_landscape_car_mode" />
		<java-symbol type="dimen" name="navigation_bar_width_car_mode" />
		<java-symbol type="dimen" name="status_bar_height" />
		<java-symbol type="dimen" name="quick_qs_offset_height" />
		<java-symbol type="dimen" name="quick_qs_total_height" />
		<java-symbol type="drawable" name="ic_jog_dial_sound_off" />
		<java-symbol type="drawable" name="ic_jog_dial_sound_on" />