Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa5b5b6 authored by Brian Duddie's avatar Brian Duddie
Browse files

Revert "Remove Activity Recognition from the Android Code." 

This reverts commit e24f1b09.

Reason for revert: b/123172409

Change-Id: Ic5863a8e8b36c8c4d8636cc4c004ad9606a3f523
parent 839ee8df

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ java_defaults { 
        "core/java/android/hardware/input/IInputDevicesChangedListener.aidl",

        "core/java/android/hardware/input/ITabletModeChangedListener.aidl",

        "core/java/android/hardware/iris/IIrisService.aidl",

        "core/java/android/hardware/location/IActivityRecognitionHardware.aidl",

        "core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl",

        "core/java/android/hardware/location/IActivityRecognitionHardwareSink.aidl",

        "core/java/android/hardware/location/IActivityRecognitionHardwareWatcher.aidl",

        "core/java/android/hardware/location/IGeofenceHardware.aidl",

        "core/java/android/hardware/location/IGeofenceHardwareCallback.aidl",

        "core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl",

config/boot-image-profile.txt

+19 −0
Original line number Diff line number Diff line
@@ -2768,6 +2768,11 @@ HPLandroid/hardware/location/GeofenceHardwareService$1;->getStatusOfMonitoringTy 
HPLandroid/hardware/location/GeofenceHardwareService$1;->registerForMonitorStateChangeCallback(ILandroid/hardware/location/IGeofenceHardwareMonitorCallback;)Z

HPLandroid/hardware/location/GeofenceHardwareService$1;->removeGeofence(II)Z

HPLandroid/hardware/location/GeofenceHardwareService;->checkPermission(III)V

HPLandroid/hardware/location/IActivityRecognitionHardwareClient$Stub$Proxy;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V

HPLandroid/hardware/location/IActivityRecognitionHardwareClient$Stub;-><init>()V

HPLandroid/hardware/location/IActivityRecognitionHardwareClient$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/location/IActivityRecognitionHardwareClient;

HPLandroid/hardware/location/IActivityRecognitionHardwareClient$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z

HPLandroid/hardware/location/IActivityRecognitionHardwareClient;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V

HPLandroid/hardware/location/IContextHubCallback$Stub;->asBinder()Landroid/os/IBinder;

HPLandroid/hardware/location/IContextHubCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z

HPLandroid/hardware/location/IContextHubService$Stub$Proxy;->findNanoAppOnHub(ILandroid/hardware/location/NanoAppFilter;)[I
@@ -21777,6 +21782,7 @@ HSPLandroid/hardware/input/KeyboardLayout$1;-><init>()V 
HSPLandroid/hardware/input/TouchCalibration$1;-><init>()V

HSPLandroid/hardware/input/TouchCalibration;-><init>()V

HSPLandroid/hardware/input/TouchCalibration;->getAffineTransform()[F

HSPLandroid/hardware/location/ActivityRecognitionHardware;->isSupported()Z

HSPLandroid/hardware/location/ContextHubInfo$1;-><init>()V

HSPLandroid/hardware/location/ContextHubInfo;-><init>(Landroid/hardware/contexthub/V1_0/ContextHub;)V

HSPLandroid/hardware/location/ContextHubMessage$1;-><init>()V
@@ -21796,6 +21802,13 @@ HSPLandroid/hardware/location/GeofenceHardwareService$1;->setGpsGeofenceHardware 
HSPLandroid/hardware/location/GeofenceHardwareService;-><init>()V

HSPLandroid/hardware/location/GeofenceHardwareService;->onBind(Landroid/content/Intent;)Landroid/os/IBinder;

HSPLandroid/hardware/location/GeofenceHardwareService;->onCreate()V

HSPLandroid/hardware/location/IActivityRecognitionHardware;->disableActivityEvent(Ljava/lang/String;I)Z

HSPLandroid/hardware/location/IActivityRecognitionHardware;->enableActivityEvent(Ljava/lang/String;IJ)Z

HSPLandroid/hardware/location/IActivityRecognitionHardware;->flush()Z

HSPLandroid/hardware/location/IActivityRecognitionHardware;->getSupportedActivities()[Ljava/lang/String;

HSPLandroid/hardware/location/IActivityRecognitionHardware;->isActivitySupported(Ljava/lang/String;)Z

HSPLandroid/hardware/location/IActivityRecognitionHardware;->registerSink(Landroid/hardware/location/IActivityRecognitionHardwareSink;)Z

HSPLandroid/hardware/location/IActivityRecognitionHardware;->unregisterSink(Landroid/hardware/location/IActivityRecognitionHardwareSink;)Z

HSPLandroid/hardware/location/IContextHubCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;

HSPLandroid/hardware/location/IContextHubCallback$Stub$Proxy;->onMessageReceipt(IILandroid/hardware/location/ContextHubMessage;)V

HSPLandroid/hardware/location/IContextHubCallback;->onMessageReceipt(IILandroid/hardware/location/ContextHubMessage;)V
@@ -55637,6 +55650,7 @@ Landroid/hardware/input/InputManagerInternal; 
Landroid/hardware/input/KeyboardLayout$1;

Landroid/hardware/input/TouchCalibration$1;

Landroid/hardware/input/TouchCalibration;

Landroid/hardware/location/ActivityRecognitionHardware;

Landroid/hardware/location/ContextHubInfo$1;

Landroid/hardware/location/ContextHubInfo;

Landroid/hardware/location/ContextHubManager;
@@ -55652,6 +55666,11 @@ Landroid/hardware/location/GeofenceHardwareMonitorEvent; 
Landroid/hardware/location/GeofenceHardwareRequestParcelable$1;

Landroid/hardware/location/GeofenceHardwareService$1;

Landroid/hardware/location/GeofenceHardwareService;

Landroid/hardware/location/IActivityRecognitionHardware$Stub;

Landroid/hardware/location/IActivityRecognitionHardware;

Landroid/hardware/location/IActivityRecognitionHardwareClient$Stub$Proxy;

Landroid/hardware/location/IActivityRecognitionHardwareClient$Stub;

Landroid/hardware/location/IActivityRecognitionHardwareClient;

Landroid/hardware/location/IContextHubCallback$Stub$Proxy;

Landroid/hardware/location/IContextHubCallback;

Landroid/hardware/location/IContextHubClient$Stub;

config/hiddenapi-greylist.txt

+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,8 @@ Landroid/hardware/input/IInputManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V 
Landroid/hardware/input/IInputManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/input/IInputManager;

Landroid/hardware/input/IInputManager$Stub;->TRANSACTION_injectInputEvent:I

Landroid/hardware/input/IInputManager;->injectInputEvent(Landroid/view/InputEvent;I)Z

Landroid/hardware/location/IActivityRecognitionHardwareClient$Stub;-><init>()V

Landroid/hardware/location/IActivityRecognitionHardwareClient;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V

Landroid/hardware/location/IContextHubService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/location/IContextHubService;

Landroid/hardware/usb/IUsbManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/hardware/usb/IUsbManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/usb/IUsbManager;

config/preloaded-classes

+3 −0
Original line number Diff line number Diff line
@@ -1405,7 +1405,10 @@ android.hardware.input.InputManager 
android.hardware.input.InputManager$InputDeviceListener

android.hardware.input.InputManager$InputDeviceListenerDelegate

android.hardware.input.InputManager$InputDevicesChangedListener

android.hardware.location.ActivityRecognitionHardware

android.hardware.location.ContextHubManager

android.hardware.location.IActivityRecognitionHardware

android.hardware.location.IActivityRecognitionHardware$Stub

android.hardware.radio.RadioManager

android.hardware.soundtrigger.SoundTrigger

android.hardware.soundtrigger.SoundTrigger$ConfidenceLevel

core/java/android/hardware/location/ActivityChangedEvent.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * 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

 */



package android.hardware.location;



parcelable ActivityChangedEvent;
 
 No newline at end of file