Improve callbacks file and enable more precise callback info by subclassing

Author: MarcMil

soot-infoflow-android/AndroidCallbacks.txt

@@ -2,26 +2,37 @@ android.accessibilityservice.AccessibilityButtonController$AccessibilityButtonCa
 android.accessibilityservice.AccessibilityService$GestureResultCallback
 android.accessibilityservice.AccessibilityService$MagnificationController$OnMagnificationChangedListener
 android.accessibilityservice.AccessibilityService$SoftKeyboardController$OnShowModeChangedListener
+android.accessibilityservice.AccessibilityService$TakeScreenshotCallback
 android.accessibilityservice.FingerprintGestureController$FingerprintGestureCallback
+android.accessibilityservice.TouchInteractionController$Callback
 android.accounts.AccountManagerCallback
 android.accounts.OnAccountsUpdateListener
 android.animation.Animator$AnimatorListener
 android.animation.Animator$AnimatorPauseListener
 android.animation.LayoutTransition$TransitionListener
 android.animation.TimeAnimator$TimeListener
 android.animation.ValueAnimator$AnimatorUpdateListener
+android.animation.ValueAnimator$DurationScaleChangeListener
 android.app.ActionBar$OnMenuVisibilityListener
 android.app.ActionBar$OnNavigationListener
 android.app.ActionBar$TabListener
+android.app.admin.DevicePolicyManager$InstallSystemUpdateCallback
+android.app.admin.DevicePolicyManager$OnClearApplicationUserDataListener
 android.app.AlarmManager$OnAlarmListener
 android.app.AppOpsManager$OnOpChangedListener
 android.app.Application$ActivityLifecycleCallbacks
 android.app.Application$OnProvideAssistDataListener
+android.app.AppOpsManager$OnOpActiveChangedListener
+android.app.AppOpsManager$OnOpChangedListener
+android.app.AppOpsManager$OnOpNotedCallback
+android.app.appsearch.BatchResultCallback
+android.app.appsearch.observer.ObserverCallback
 android.app.DatePickerDialog$OnDateSetListener
 android.app.FragmentBreadCrumbs$OnBreadCrumbClickListener
 android.app.FragmentHostCallback
 android.app.FragmentManager$OnBackStackChangedListener
 android.app.KeyguardManager$KeyguardDismissCallback
+android.app.KeyguardManager$KeyguardLockedStateListener
 android.app.KeyguardManager$OnKeyguardExitResult
 android.app.LoaderManager$LoaderCallbacks
 android.app.PendingIntent$OnFinished
@@ -34,6 +45,7 @@ android.app.UiAutomation$OnAccessibilityEventListener
 android.app.WallpaperManager$OnColorsChangedListener
 android.app.admin.DevicePolicyManager$OnClearApplicationUserDataListener
 android.app.usage.NetworkStatsManager$UsageCallback
+android.app.WallpaperManager$OnColorsChangedListener
 android.bluetooth.BluetoothAdapter$LeScanCallback
 android.bluetooth.BluetoothGattCallback
 android.bluetooth.BluetoothGattServerCallback
@@ -60,6 +72,8 @@ android.content.SharedPreferences$OnSharedPreferenceChangeListener
 android.content.SyncStatusObserver
 android.content.pm.LauncherApps$Callback
 android.content.pm.PackageInstaller$SessionCallback
+android.content.pm.PackageManager$OnChecksumsReadyListener
+android.content.SharedPreferences$OnSharedPreferenceChangeListener
 android.database.sqlite.SQLiteTransactionListener
 android.drm.DrmManagerClient$OnErrorListener
 android.drm.DrmManagerClient$OnEventListener
@@ -73,6 +87,10 @@ android.graphics.SurfaceTexture$OnFrameAvailableListener
 android.graphics.drawable.Animatable2$AnimationCallback
 android.graphics.drawable.Drawable$Callback
 android.graphics.drawable.Icon$OnDrawableLoadedListener
+android.graphics.ImageDecoder$OnHeaderDecodedListener
+android.graphics.ImageDecoder$OnPartialImageListener
+android.graphics.SurfaceTexture$OnFrameAvailableListener
+android.hardware.biometrics.BiometricPrompt$AuthenticationCallback
 android.hardware.Camera$AutoFocusCallback
 android.hardware.Camera$AutoFocusMoveCallback
 android.hardware.Camera$ErrorCallback
@@ -90,13 +108,23 @@ android.hardware.biometrics.BiometricPrompt$AuthenticationCallback
 android.hardware.camera2.CameraCaptureSession$CaptureCallback
 android.hardware.camera2.CameraCaptureSession$StateCallback
 android.hardware.camera2.CameraDevice$StateCallback
+android.hardware.camera2.CameraExtensionSession$ExtensionCaptureCallback
+android.hardware.camera2.CameraExtensionSession$StateCallback
 android.hardware.camera2.CameraManager$AvailabilityCallback
 android.hardware.camera2.CameraManager$TorchCallback
+android.hardware.camera2.CameraOfflineSession$CameraOfflineSessionCallback
 android.hardware.display.DisplayManager$DisplayListener
 android.hardware.display.VirtualDisplay$Callback
 android.hardware.fingerprint.FingerprintManager$AuthenticationCallback
 android.hardware.input.InputManager$InputDeviceListener
+android.hardware.SensorEventCallback
+android.hardware.SensorEventListener
+android.hardware.SensorListener
+android.hardware.SensorManager$DynamicSensorCallback
+android.hardware.TriggerEventListener
 android.inputmethodservice.KeyboardView$OnKeyboardActionListener
+android.location.Geocoder$GeocodeListener
+android.location.GnssAntennaInfo$Listener
 android.location.GnssMeasurementsEvent$Callback
 android.location.GnssNavigationMessage$Callback
 android.location.GnssStatus$Callback
@@ -105,23 +133,42 @@ android.location.GpsStatus$NmeaListener
 android.location.LocationListener
 android.location.OnNmeaMessageListener
 android.media.AudioDeviceCallback
+android.media.audiofx.AudioEffect$OnControlStatusChangeListener
+android.media.audiofx.AudioEffect$OnEnableStatusChangeListener
+android.media.audiofx.BassBoost$OnParameterChangeListener
+android.media.audiofx.EnvironmentalReverb$OnParameterChangeListener
+android.media.audiofx.Equalizer$OnParameterChangeListener
+android.media.audiofx.PresetReverb$OnParameterChangeListener
+android.media.audiofx.Virtualizer$OnParameterChangeListener
+android.media.audiofx.Visualizer$OnDataCaptureListener
 android.media.AudioManager$AudioPlaybackCallback
 android.media.AudioManager$AudioRecordingCallback
 android.media.AudioManager$OnAudioFocusChangeListener
+android.media.AudioManager$OnCommunicationDeviceChangedListener
+android.media.AudioManager$OnModeChangedListener
 android.media.AudioRecord$OnRecordPositionUpdateListener
 android.media.AudioRecord$OnRoutingChangedListener
 android.media.AudioRouting$OnRoutingChangedListener
+android.media.AudioTrack$OnCodecFormatChangedListener
 android.media.AudioTrack$OnPlaybackPositionUpdateListener
 android.media.AudioTrack$OnRoutingChangedListener
+android.media.AudioTrack$StreamEventCallback
+android.media.browse.MediaBrowser$ConnectionCallback
+android.media.browse.MediaBrowser$ItemCallback
+android.media.browse.MediaBrowser$SubscriptionCallback
+android.media.effect.EffectUpdateListener
 android.media.ImageReader$OnImageAvailableListener
 android.media.ImageWriter$OnImageReleasedListener
 android.media.JetPlayer$OnJetEventListener
 android.media.MediaCas$EventListener
 android.media.MediaCodec$Callback
+android.media.MediaCodec$OnFirstTunnelFrameReadyListener
 android.media.MediaCodec$OnFrameRenderedListener
+android.media.MediaController2$ControllerCallback
 android.media.MediaDrm$OnEventListener
 android.media.MediaDrm$OnExpirationUpdateListener
 android.media.MediaDrm$OnKeyStatusChangeListener
+android.media.MediaDrm$OnSessionLostStateListener
 android.media.MediaPlayer$OnBufferingUpdateListener
 android.media.MediaPlayer$OnCompletionListener
 android.media.MediaPlayer$OnDrmInfoListener
@@ -140,10 +187,18 @@ android.media.MediaRecorder$OnInfoListener
 android.media.MediaRouter$Callback
 android.media.MediaRouter$SimpleCallback
 android.media.MediaRouter$VolumeCallback
+android.media.MediaRouter2$ControllerCallback
+android.media.MediaRouter2$OnGetControllerHintsListener
+android.media.MediaRouter2$RouteCallback
+android.media.MediaRouter2$TransferCallback
 android.media.MediaScannerConnection$MediaScannerConnectionClient
 android.media.MediaScannerConnection$OnScanCompletedListener
+android.media.MediaSession2$SessionCallback
 android.media.MediaSync$Callback
 android.media.MediaSync$OnErrorListener
+android.media.midi.MidiManager$DeviceCallback
+android.media.midi.MidiManager$OnDeviceOpenedListener
+android.media.projection.MediaProjection$Callback
 android.media.RemoteControlClient$OnGetPlaybackPositionListener
 android.media.RemoteControlClient$OnMetadataUpdateListener
 android.media.RemoteControlClient$OnPlaybackPositionUpdateListener
@@ -168,13 +223,25 @@ android.media.projection.MediaProjection$Callback
 android.media.session.MediaController$Callback
 android.media.session.MediaSession$Callback
 android.media.session.MediaSessionManager$OnActiveSessionsChangedListener
+android.media.session.MediaSessionManager$OnMediaKeyEventSessionChangedListener
+android.media.session.MediaSessionManager$OnSession2TokensChangedListener
+android.media.SoundPool$OnLoadCompleteListener
+android.media.Spatializer$OnHeadTrackerAvailableListener
+android.media.Spatializer$OnSpatializerStateChangedListener
+android.media.tv.interactive.TvInteractiveAppManager$TvInteractiveAppCallback
+android.media.tv.interactive.TvInteractiveAppView$OnUnhandledInputEventListener
+android.media.tv.interactive.TvInteractiveAppView$TvInteractiveAppCallback
 android.media.tv.TvInputManager$TvInputCallback
 android.media.tv.TvRecordingClient$RecordingCallback
 android.media.tv.TvView$OnUnhandledInputEventListener
 android.media.tv.TvView$TimeShiftPositionCallback
 android.media.tv.TvView$TvInputCallback
+android.net.ConnectivityDiagnosticsManager$ConnectivityDiagnosticsCallback
 android.net.ConnectivityManager$NetworkCallback
 android.net.ConnectivityManager$OnNetworkActiveListener
+android.net.DnsResolver$Callback
+android.net.ipsec.ike.ChildSessionCallback
+android.net.ipsec.ike.IkeSessionCallback
 android.net.nsd.NsdManager$DiscoveryListener
 android.net.nsd.NsdManager$RegistrationListener
 android.net.nsd.NsdManager$ResolveListener
@@ -186,29 +253,47 @@ android.net.wifi.WifiManager$WpsCallback
 android.net.wifi.aware.AttachCallback
 android.net.wifi.aware.DiscoverySessionCallback
 android.net.wifi.aware.IdentityChangedListener
+android.net.wifi.EasyConnectStatusCallback
 android.net.wifi.p2p.WifiP2pManager$ActionListener
 android.net.wifi.p2p.WifiP2pManager$ChannelListener
 android.net.wifi.p2p.WifiP2pManager$ConnectionInfoListener
+android.net.wifi.p2p.WifiP2pManager$DeviceInfoListener
+android.net.wifi.p2p.WifiP2pManager$DiscoveryStateListener
 android.net.wifi.p2p.WifiP2pManager$DnsSdServiceResponseListener
 android.net.wifi.p2p.WifiP2pManager$DnsSdTxtRecordListener
+android.net.wifi.p2p.WifiP2pManager$ExternalApproverRequestListener
 android.net.wifi.p2p.WifiP2pManager$GroupInfoListener
+android.net.wifi.p2p.WifiP2pManager$NetworkInfoListener
+android.net.wifi.p2p.WifiP2pManager$P2pStateListener
 android.net.wifi.p2p.WifiP2pManager$PeerListListener
 android.net.wifi.p2p.WifiP2pManager$ServiceResponseListener
 android.net.wifi.p2p.WifiP2pManager$UpnpServiceResponseListener
 android.net.wifi.rtt.RangingResultCallback
+android.net.wifi.WifiManager$LocalOnlyHotspotCallback
+android.net.wifi.WifiManager$ScanResultsCallback
+android.net.wifi.WifiManager$SubsystemRestartTrackingCallback
+android.net.wifi.WifiManager$SuggestionConnectionStatusListener
+android.net.wifi.WifiManager$SuggestionUserApprovalStatusListener
+android.net.wifi.WifiManager$WpsCallback
 android.nfc.NfcAdapter$CreateBeamUrisCallback
 android.nfc.NfcAdapter$CreateNdefMessageCallback
 android.nfc.NfcAdapter$OnNdefPushCompleteCallback
 android.nfc.NfcAdapter$OnTagRemovedListener
 android.nfc.NfcAdapter$ReaderCallback
+android.os.BugreportManager$BugreportCallback
 android.os.CancellationSignal$OnCancelListener
+android.os.FileUtils$ProgressListener
 android.os.Handler$Callback
 android.os.IBinder$DeathRecipient
 android.os.MessageQueue$IdleHandler
 android.os.MessageQueue$OnFileDescriptorEventListener
 android.os.ParcelFileDescriptor$OnCloseListener
+android.os.PowerManager$OnThermalStatusChangedListener
+android.os.PowerManager$WakeLockStateListener
 android.os.ProxyFileDescriptorCallback
 android.os.RecoverySystem$ProgressListener
+android.os.storage.OnObbStateChangeListener
+android.os.storage.StorageManager$StorageVolumeCallback
 android.os.StrictMode$OnThreadViolationListener
 android.os.StrictMode$OnVmViolationListener
 android.os.storage.OnObbStateChangeListener
@@ -221,6 +306,7 @@ android.preference.PreferenceManager$OnActivityStopListener
 android.print.PrintDocumentAdapter$LayoutResultCallback
 android.print.PrintDocumentAdapter$WriteResultCallback
 android.printservice.CustomPrinterIconCallback
+android.provider.CloudMediaProvider$CloudMediaSurfaceStateChangedCallback
 android.provider.FontsContract$FontRequestCallback
 android.renderscript.Allocation$OnBufferAvailableListener
 android.sax.ElementListener
@@ -233,10 +319,13 @@ android.security.ConfirmationCallback
 android.security.KeyChainAliasCallback
 android.service.autofill.FillCallback
 android.service.autofill.SaveCallback
+android.service.autofill.SavedDatasetsInfoCallback
 android.service.carrier.CarrierMessagingService$ResultCallback
 android.service.voice.AlwaysOnHotwordDetector$Callback
 android.speech.RecognitionListener
 android.speech.RecognitionService$Callback
+android.speech.RecognitionService$SupportCallback
+android.speech.RecognitionSupportCallback
 android.speech.tts.SynthesisCallback
 android.speech.tts.TextToSpeech$OnInitListener
 android.speech.tts.TextToSpeech$OnUtteranceCompletedListener
@@ -264,7 +353,9 @@ android.telephony.TelephonyManager$UssdResponseCallback
 android.telephony.TelephonyScanManager$NetworkScanCallback
 android.telephony.mbms.DownloadProgressListener
 android.telephony.mbms.DownloadStatusListener
+android.telephony.mbms.GroupCallCallback
 android.telephony.mbms.MbmsDownloadSessionCallback
+android.telephony.mbms.MbmsGroupCallSessionCallback
 android.telephony.mbms.MbmsStreamingSessionCallback
 android.telephony.mbms.StreamingServiceCallback
 android.text.TextUtils$EllipsizeCallback
@@ -281,27 +372,45 @@ android.text.method.NumberKeyListener
 android.text.method.QwertyKeyListener
 android.text.method.TextKeyListener
 android.text.method.TimeKeyListener
+android.text.TextUtils$EllipsizeCallback
 android.transition.Transition$EpicenterCallback
 android.transition.Transition$TransitionListener
+android.view.accessibility.AccessibilityManager$AccessibilityServicesStateChangeListener
+android.view.accessibility.AccessibilityManager$AccessibilityStateChangeListener
+android.view.accessibility.AccessibilityManager$AudioDescriptionRequestedChangeListener
+android.view.accessibility.AccessibilityManager$TouchExplorationStateChangeListener
+android.view.accessibility.CaptioningManager$CaptioningChangeListener
 android.view.ActionMode$Callback
 android.view.ActionProvider$VisibilityListener
+android.view.animation.Animation$AnimationListener
+android.view.AttachedSurfaceControl$OnBufferTransformHintChangedListener
+android.view.autofill.AutofillManager$AutofillCallback
 android.view.Choreographer$FrameCallback
+android.view.Choreographer$VsyncCallback
+android.view.displayhash.DisplayHashResultCallback
 android.view.GestureDetector$OnContextClickListener
 android.view.GestureDetector$OnDoubleTapListener
 android.view.GestureDetector$OnGestureListener
 android.view.GestureDetector$SimpleOnGestureListener
+android.view.inputmethod.InputMethod$SessionCallback
+android.view.inputmethod.InputMethodSession$EventCallback
 android.view.InputQueue$Callback
 android.view.KeyEvent$Callback
 android.view.MenuItem$OnActionExpandListener
 android.view.MenuItem$OnMenuItemClickListener
+android.view.OnReceiveContentListener
 android.view.OrientationEventListener
 android.view.OrientationListener
 android.view.PixelCopy$OnPixelCopyFinishedListener
 android.view.ScaleGestureDetector$OnScaleGestureListener
 android.view.ScaleGestureDetector$SimpleOnScaleGestureListener
+android.view.ScrollCaptureCallback
+android.view.SurfaceControl$TransactionCommittedListener
 android.view.SurfaceHolder$Callback
 android.view.SurfaceHolder$Callback2
 android.view.TextureView$SurfaceTextureListener
+android.view.translation.UiTranslationStateCallback
+android.view.translation.ViewTranslationCallback
 android.view.View$OnApplyWindowInsetsListener
 android.view.View$OnAttachStateChangeListener
 android.view.View$OnCapturedPointerListener
@@ -332,6 +441,9 @@ android.view.ViewTreeObserver$OnWindowFocusChangeListener
 android.view.Window$Callback
 android.view.Window$OnFrameMetricsAvailableListener
 android.view.Window$OnRestrictedCaptionAreaChangedListener
+android.view.WindowInsetsAnimation$Callback
+android.view.WindowInsetsAnimationControlListener
+android.view.WindowInsetsController$OnControllableInsetsChangedListener
 android.view.accessibility.AccessibilityManager$AccessibilityStateChangeListener
 android.view.accessibility.AccessibilityManager$TouchExplorationStateChangeListener
 android.view.accessibility.CaptioningManager$CaptioningChangeListener
@@ -368,6 +480,7 @@ android.widget.ExpandableListView$OnGroupClickListener
 android.widget.ExpandableListView$OnGroupCollapseListener
 android.widget.ExpandableListView$OnGroupExpandListener
 android.widget.Filter$FilterListener
+android.widget.inline.InlineContentView$SurfaceControlCallback
 android.widget.NumberPicker$OnDismissListener
 android.widget.NumberPicker$OnScrollListener
 android.widget.NumberPicker$OnValueChangeListener
@@ -387,8 +500,11 @@ android.widget.SlidingDrawer$OnDrawerScrollListener
 android.widget.TabHost$OnTabChangeListener
 android.widget.TextView$OnEditorActionListener
 android.widget.TimePicker$OnTimeChangedListener
+android.widget.Toast$Callback
 android.widget.Toolbar$OnMenuItemClickListener
 android.widget.ZoomButtonsController$OnZoomListener
+android.window.OnBackInvokedCallback
+android.window.SplashScreen$OnExitAnimationListener
 com.android.volley.Response$ErrorListener
 com.android.volley.Response$Listener
 java.beans.PropertyChangeListener

soot-infoflow-android/src/soot/jimple/infoflow/android/SetupApplication.java

@@ -728,8 +728,8 @@ private void calculateCallbackMethods(LayoutFileParser lfp, SootClass component)
 		// filter out callbacks even if the respective component is only
 		// analyzed later.
 		AbstractCallbackAnalyzer jimpleClass = callbackClasses == null
-				? new DefaultCallbackAnalyzer(config, entryPointClasses, callbackMethods, callbackFile)
-				: new DefaultCallbackAnalyzer(config, entryPointClasses, callbackMethods, callbackClasses);
+				? createCallbackAnalyzerFromFile(config, entryPointClasses, callbackMethods, callbackFile)
+				: createCallbackAnalyzerFromClassesSet(config, entryPointClasses, callbackMethods, callbackClasses);
 		if (valueProvider != null)
 			jimpleClass.setValueProvider(valueProvider);
 		jimpleClass.addCallbackFilter(new AlienHostComponentFilter(entrypoints));
@@ -909,6 +909,18 @@ else if (!fragmentFilter.accepts(pair.getO1(), pair.getO2().getTargetMethod().ge
 		}
 	}
 
+	protected AbstractCallbackAnalyzer createCallbackAnalyzerFromClassesSet(InfoflowAndroidConfiguration config,
+			Set<SootClass> entryPointClasses, MultiMap<SootClass, AndroidCallbackDefinition> callbackMethods,
+			Set<String> callbackClasses) throws IOException {
+		return new DefaultCallbackAnalyzer(config, entryPointClasses, callbackMethods, callbackClasses);
+	}
+
+	protected AbstractCallbackAnalyzer createCallbackAnalyzerFromFile(InfoflowAndroidConfiguration config,
+			Set<SootClass> entryPointClasses, MultiMap<SootClass, AndroidCallbackDefinition> callbackMethods,
+			String callbackFile) throws IOException {
+		return new DefaultCallbackAnalyzer(config, entryPointClasses, callbackMethods, callbackFile);
+	}
+
 	/**
 	 * Creates the memory watcher for aborting the callback analysis in case it runs
 	 * out of memory. This method also starts the watchdog thread. Derived classes