From 45d7e3c1e18a700b8e9cf23ee5b61b4986623e27 Mon Sep 17 00:00:00 2001 From: cjh1249131356 Date: Mon, 24 Jun 2024 18:00:46 +0530 Subject: [PATCH] oplus-fwk: Cleanup --- .../src/android/app/OplusActivityManager.java | 50 +- .../app/OplusExSystemServiceHelper.java | 84 --- .../android/app/OplusWhiteListManager.java | 4 +- .../src/android/app/job/IJobInfoExt.java | 86 +-- .../bluetooth/OplusBluetoothAdapter.java | 2 +- .../android/common/IOplusCommonFeature.java | 28 +- .../src/android/common/OplusFeatureList.java | 16 +- .../android/common/OplusFrameworkFactory.java | 26 +- .../content/res/OplusBaseConfiguration.java | 4 +- .../src/android/hardware/IAONHECallbacks.java | 195 ----- .../hardware/camera2/IOplusCameraManager.java | 65 -- .../hardware/camera2/OplusCameraManager.java | 704 ++---------------- .../src/android/view/OplusWindowManager.java | 14 +- .../animation/OplusBezierInterpolator.java | 62 +- .../view/animation/OplusUnitBezier.java | 73 +- .../src/com/oplus/app/OplusAppEnterInfo.java | 12 +- .../src/com/oplus/app/OplusAppExitInfo.java | 12 +- oplus-fwk/src/com/oplus/app/OplusAppInfo.java | 12 +- .../com/oplus/app/OplusAppSwitchConfig.java | 16 +- .../com/oplus/app/OplusAppSwitchManager.java | 74 +- .../content/OplusFeatureConfigManager.java | 51 +- .../flexiblewindow/FlexibleTaskView.java | 38 + .../com/oplus/orms/OplusResourceManager.java | 38 +- .../src/com/oplus/orms/info/OrmsSaParam.java | 16 +- oplus-fwk/src/com/oplus/os/OplusBuild.java | 33 +- .../src/com/oplus/os/OplusUsbEnvironment.java | 314 ++++---- .../oplus/osense/OsenseResEventClient.java | 11 +- .../eventinfo/IOsenseEventCallback.java | 7 +- .../osense/eventinfo/OsenseEventCallback.java | 1 - .../OplusLongshotCustomController.java | 12 +- .../screenshot/OplusLongshotViewBase.java | 40 +- .../screenshot/OplusLongshowViewInfo.java | 12 +- .../oplus/uifirst/OplusUIFirstManager.java | 3 +- .../com/oplus/util/OplusChangeTextUtil.java | 104 +-- ...etworkUtils.java => OplusNetworkUtil.java} | 16 +- .../com/oplus/wrapper/os/ServiceManager.java | 23 +- .../oplus/wrapper/view/IWindowManager.java | 134 +--- .../zoomwindow/IOplusZoomWindowObserver.aidl | 22 +- .../oplus/zoomwindow/OplusZoomWindowInfo.aidl | 6 +- .../oplus/zoomwindow/OplusZoomWindowInfo.java | 74 +- .../zoomwindow/OplusZoomWindowManager.java | 42 +- .../oneplus/odm/OpDeviceManagerInjector.java | 38 +- 42 files changed, 787 insertions(+), 1787 deletions(-) delete mode 100644 oplus-fwk/src/android/app/OplusExSystemServiceHelper.java delete mode 100644 oplus-fwk/src/android/hardware/IAONHECallbacks.java delete mode 100644 oplus-fwk/src/android/hardware/camera2/IOplusCameraManager.java create mode 100644 oplus-fwk/src/com/oplus/flexiblewindow/FlexibleTaskView.java rename oplus-fwk/src/com/oplus/util/{OplusNetworkUtils.java => OplusNetworkUtil.java} (74%) diff --git a/oplus-fwk/src/android/app/OplusActivityManager.java b/oplus-fwk/src/android/app/OplusActivityManager.java index 2c373bc..3d51afc 100644 --- a/oplus-fwk/src/android/app/OplusActivityManager.java +++ b/oplus-fwk/src/android/app/OplusActivityManager.java @@ -1,25 +1,25 @@ -package android.app; - -import android.os.RemoteException; - -import com.oplus.app.OplusAppInfo; - -import java.util.ArrayList; -import java.util.List; - -public class OplusActivityManager { - - private static OplusActivityManager sOplusActivityManager = null; - private static ArrayList sTopAppInfos = new ArrayList(); - - public static OplusActivityManager getInstance() { - if (sOplusActivityManager == null) { - sOplusActivityManager = new OplusActivityManager(); - } - return sOplusActivityManager; - } - - public List getAllTopAppInfos() throws RemoteException { - return (ArrayList) sTopAppInfos.clone(); - } -} +package android.app; + +import android.os.RemoteException; + +import com.oplus.app.OplusAppInfo; + +import java.util.ArrayList; +import java.util.List; + +public class OplusActivityManager { + + private static OplusActivityManager sOplusActivityManager = null; + private static ArrayList sTopAppInfos = new ArrayList(); + + public static OplusActivityManager getInstance() { + if (sOplusActivityManager == null) { + sOplusActivityManager = new OplusActivityManager(); + } + return sOplusActivityManager; + } + + public List getAllTopAppInfos() throws RemoteException { + return (ArrayList) sTopAppInfos.clone(); + } +} diff --git a/oplus-fwk/src/android/app/OplusExSystemServiceHelper.java b/oplus-fwk/src/android/app/OplusExSystemServiceHelper.java deleted file mode 100644 index d6fe527..0000000 --- a/oplus-fwk/src/android/app/OplusExSystemServiceHelper.java +++ /dev/null @@ -1,84 +0,0 @@ -package android.app; - -import android.content.ComponentName; -import android.content.Intent; -import android.os.Handler; -import android.text.TextUtils; -import android.util.Log; -//import com.oplus.multiapp.BaseOplusMultiAppManager; - -/* loaded from: classes.dex */ -public class OplusExSystemServiceHelper { - private static final String ATHENA_SYSTEM_SERVICE_CLASSNAME = "com.oplus.athena.systemservice.OplusAthenaSystemService"; - public static final String COREAPPFEATURE_SYSTEM_SERVICE_CLASSNAME = "com.oplus.customize.coreapp.service.OplusCoreAppFeatureService"; - public static final String EX_SYSTEM_SERVICE_CLASSNAME = "com.oplus.exsystemservice.OplusSharedSystemService"; - public static final String EX_SYSTEM_SERVICE_PKGNAME = "com.oplus.exsystemservice"; - private static final String TAG = OplusExSystemServiceHelper.class.getSimpleName(); - private static volatile OplusExSystemServiceHelper sIntance; - - public static OplusExSystemServiceHelper getInstance() { - if (sIntance == null) { - synchronized (OplusExSystemServiceHelper.class) { - if (sIntance == null) { - sIntance = new OplusExSystemServiceHelper(); - } - } - } - return sIntance; - } - - public boolean checkOplusExSystemService(boolean systemThread, String className) { - if (TextUtils.isEmpty(className)) { - Log.w(TAG, "checkOplusExSystemService className is null or empty str"); - return false; - } else if (!systemThread) { - return false; - } else { - try { - if (!EX_SYSTEM_SERVICE_CLASSNAME.equals(className) && !COREAPPFEATURE_SYSTEM_SERVICE_CLASSNAME.equals(className)) { - if (!ATHENA_SYSTEM_SERVICE_CLASSNAME.equals(className)) { - return false; - } - } - return true; - } catch (Exception e) { - Log.e(TAG, "checkOplusExSystemService e = " + e); - return false; - } - } - } - - public boolean checkOplusExSystemService(boolean systemThread, Intent intent) { - if (intent == null) { - Log.w(TAG, "checkOplusExSystemService intent is null"); - return false; - } else if (intent.getComponent() == null) { - Log.w(TAG, "checkOplusExSystemService intent getComponent is null"); - return false; - } else { - return checkOplusExSystemService(systemThread, intent.getComponent().getClassName()); - } - } - - public boolean checkOplusExSystemService(Handler handler, String className) { - return checkOplusExSystemService(true, className); - } - - public ComponentName getComponentName() { - return new ComponentName(EX_SYSTEM_SERVICE_PKGNAME, EX_SYSTEM_SERVICE_CLASSNAME); - } - /* - public void ensureMediaProviderPriority(Handler activityThread, ComponentName name, Runnable runConnection) { - if (name.getClassName().contains(BaseOplusMultiAppManager.MEDIA_PROVIDER_PACKAGE_NAME)) { - Log.i(TAG, "connected :" + name.getClassName()); - } - if (checkOplusExSystemService(activityThread, name.getClassName())) { - runConnection.run(); - } else if (name.getClassName().contains(BaseOplusMultiAppManager.MEDIA_PROVIDER_PACKAGE_NAME)) { - activityThread.postAtFrontOfQueue(runConnection); - } else { - activityThread.post(runConnection); - } - } - */ -} diff --git a/oplus-fwk/src/android/app/OplusWhiteListManager.java b/oplus-fwk/src/android/app/OplusWhiteListManager.java index 1110c02..6c6d1e5 100644 --- a/oplus-fwk/src/android/app/OplusWhiteListManager.java +++ b/oplus-fwk/src/android/app/OplusWhiteListManager.java @@ -8,8 +8,8 @@ public class OplusWhiteListManager { public OplusWhiteListManager(Context context) {} - public ArrayList getStageProtectListFromPkg(String pkg, int type) { - return new ArrayList(); + public ArrayList getStageProtectListFromPkg(String calledPkg, int type) { + return new ArrayList<>(); } public void addStageProtectInfo(String pkg, long timeout) {} diff --git a/oplus-fwk/src/android/app/job/IJobInfoExt.java b/oplus-fwk/src/android/app/job/IJobInfoExt.java index c1279fe..d8b96e9 100644 --- a/oplus-fwk/src/android/app/job/IJobInfoExt.java +++ b/oplus-fwk/src/android/app/job/IJobInfoExt.java @@ -1,43 +1,43 @@ -package android.app.job; - -public interface IJobInfoExt { - - public final class JobBuilderExt { - - public boolean mIsOplusJob; - - public JobBuilderExt setRequiresBattIdle(boolean requiresBattIdle, int extra) { - return this; - } - } - - default boolean getBooleanConstraint(String type, boolean defValue) { - return defValue; - } - - default String getStringConstraint(String type, String defValue) { - return defValue; - } - - default int getIntConstraint(String type, int defValue) { - return defValue; - } - - default long getLongConstraint(String type, long defValue) { - return defValue; - } - - default void setBooleanConstraint(String type, boolean value) {} - - default void setStringConstraint(String type, String value) {} - - default void setIntConstraint(String type, int value) {} - - default void setLongConstraint(JobInfo job, String type, long value) {} - - default void initJobInfo(Object in) {} - - default void initJobInfoPure(JobBuilderExt jobBuilderExt) {} - - default void writeToParcelJobInfo(Object out, int flags) {} -} +package android.app.job; + +public interface IJobInfoExt { + + public final class JobBuilderExt { + + public boolean mIsOplusJob; + + public JobBuilderExt setRequiresBattIdle(boolean requiresBattIdle, int extra) { + return this; + } + } + + default boolean getBooleanConstraint(String type, boolean defValue) { + return defValue; + } + + default String getStringConstraint(String type, String defValue) { + return defValue; + } + + default int getIntConstraint(String type, int defValue) { + return defValue; + } + + default long getLongConstraint(String type, long defValue) { + return defValue; + } + + default void setBooleanConstraint(String type, boolean value) {} + + default void setStringConstraint(String type, String value) {} + + default void setIntConstraint(String type, int value) {} + + default void setLongConstraint(JobInfo job, String type, long value) {} + + default void initJobInfo(Object in) {} + + default void initJobInfoPure(JobBuilderExt jobBuilderExt) {} + + default void writeToParcelJobInfo(Object out, int flags) {} +} diff --git a/oplus-fwk/src/android/bluetooth/OplusBluetoothAdapter.java b/oplus-fwk/src/android/bluetooth/OplusBluetoothAdapter.java index 3dda63c..c542d25 100644 --- a/oplus-fwk/src/android/bluetooth/OplusBluetoothAdapter.java +++ b/oplus-fwk/src/android/bluetooth/OplusBluetoothAdapter.java @@ -2,7 +2,7 @@ package android.bluetooth; public class OplusBluetoothAdapter { - private static OplusBluetoothAdapter sAdapter; + private static OplusBluetoothAdapter sAdapter = null; public static OplusBluetoothAdapter getOplusBluetoothAdapter() { if (sAdapter == null) { diff --git a/oplus-fwk/src/android/common/IOplusCommonFeature.java b/oplus-fwk/src/android/common/IOplusCommonFeature.java index 1d8ccb5..6662a68 100644 --- a/oplus-fwk/src/android/common/IOplusCommonFeature.java +++ b/oplus-fwk/src/android/common/IOplusCommonFeature.java @@ -1,14 +1,14 @@ -package android.common; - -import android.common.OplusFeatureList; - -public interface IOplusCommonFeature { - - default OplusFeatureList.OplusIndex index() { - return OplusFeatureList.OplusIndex.End; - } - - default IOplusCommonFeature getDefault() { - return null; - } -} +package android.common; + +import android.common.OplusFeatureList; + +public interface IOplusCommonFeature { + + default OplusFeatureList.OplusIndex index() { + return OplusFeatureList.OplusIndex.End; + } + + default IOplusCommonFeature getDefault() { + return null; + } +} diff --git a/oplus-fwk/src/android/common/OplusFeatureList.java b/oplus-fwk/src/android/common/OplusFeatureList.java index 50ba70f..fdc91f9 100644 --- a/oplus-fwk/src/android/common/OplusFeatureList.java +++ b/oplus-fwk/src/android/common/OplusFeatureList.java @@ -1,8 +1,8 @@ -package android.common; - -public class OplusFeatureList { - - public enum OplusIndex { - End - } -} +package android.common; + +public class OplusFeatureList { + + public enum OplusIndex { + End + } +} diff --git a/oplus-fwk/src/android/common/OplusFrameworkFactory.java b/oplus-fwk/src/android/common/OplusFrameworkFactory.java index 4daf029..26687d5 100644 --- a/oplus-fwk/src/android/common/OplusFrameworkFactory.java +++ b/oplus-fwk/src/android/common/OplusFrameworkFactory.java @@ -1,13 +1,13 @@ -package android.common; - -public class OplusFrameworkFactory { - - private static OplusFrameworkFactory sOplusFrameworkFactory = null; - - public static OplusFrameworkFactory getInstance() { - if (sOplusFrameworkFactory == null) { - sOplusFrameworkFactory = new OplusFrameworkFactory(); - } - return sOplusFrameworkFactory; - } -} +package android.common; + +public class OplusFrameworkFactory { + + private static OplusFrameworkFactory sOplusFrameworkFactory = null; + + public static OplusFrameworkFactory getInstance() { + if (sOplusFrameworkFactory == null) { + sOplusFrameworkFactory = new OplusFrameworkFactory(); + } + return sOplusFrameworkFactory; + } +} diff --git a/oplus-fwk/src/android/content/res/OplusBaseConfiguration.java b/oplus-fwk/src/android/content/res/OplusBaseConfiguration.java index 0d96089..0f65fdd 100644 --- a/oplus-fwk/src/android/content/res/OplusBaseConfiguration.java +++ b/oplus-fwk/src/android/content/res/OplusBaseConfiguration.java @@ -3,10 +3,8 @@ package android.content.res; import oplus.content.res.OplusExtraConfiguration; public abstract class OplusBaseConfiguration { - - public OplusExtraConfiguration mOplusExtraConfiguration = null; public OplusExtraConfiguration getOplusExtraConfiguration() { - return mOplusExtraConfiguration; + return null; } } diff --git a/oplus-fwk/src/android/hardware/IAONHECallbacks.java b/oplus-fwk/src/android/hardware/IAONHECallbacks.java deleted file mode 100644 index d584141..0000000 --- a/oplus-fwk/src/android/hardware/IAONHECallbacks.java +++ /dev/null @@ -1,195 +0,0 @@ -package android.hardware; - -import android.os.Binder; -import android.os.IBinder; -import android.os.IInterface; -import android.os.Parcel; -import android.os.RemoteException; - -/* loaded from: classes.dex */ -public interface IAONHECallbacks extends IInterface { - public static final String DESCRIPTOR = "android.hardware.IAONHECallbacks"; - public static final int ERROR_AON_DISABLED = 2; - public static final int ERROR_AON_FORCE_CLOSE = 3; - public static final int ERROR_AON_IN_CLOSED = 0; - public static final int ERROR_AON_IN_USE = 1; - public static final int ERROR_AON_NO_INDEX = -1; - - void onClosed() throws RemoteException; - - void onError(int i) throws RemoteException; - - void onHEDetected() throws RemoteException; - - void onOpened() throws RemoteException; - - /* loaded from: classes.dex */ - public static class Default implements IAONHECallbacks { - @Override // android.hardware.IAONHECallbacks - public void onOpened() throws RemoteException { - } - - @Override // android.hardware.IAONHECallbacks - public void onClosed() throws RemoteException { - } - - @Override // android.hardware.IAONHECallbacks - public void onError(int errorCode) throws RemoteException { - } - - @Override // android.hardware.IAONHECallbacks - public void onHEDetected() throws RemoteException { - } - - @Override // android.os.IInterface - public IBinder asBinder() { - return null; - } - } - - /* loaded from: classes.dex */ - public static abstract class Stub extends Binder implements IAONHECallbacks { - static final int TRANSACTION_onClosed = 2; - static final int TRANSACTION_onError = 3; - static final int TRANSACTION_onHEDetected = 4; - static final int TRANSACTION_onOpened = 1; - - public Stub() { - attachInterface(this, IAONHECallbacks.DESCRIPTOR); - } - - public static IAONHECallbacks asInterface(IBinder obj) { - if (obj == null) { - return null; - } - IInterface iin = obj.queryLocalInterface(IAONHECallbacks.DESCRIPTOR); - if (iin != null && (iin instanceof IAONHECallbacks)) { - return (IAONHECallbacks) iin; - } - return new Proxy(obj); - } - - @Override // android.os.IInterface - public IBinder asBinder() { - return this; - } - - public static String getDefaultTransactionName(int transactionCode) { - switch (transactionCode) { - case 1: - return "onOpened"; - case 2: - return "onClosed"; - case 3: - return "onError"; - case 4: - return "onHEDetected"; - default: - return null; - } - } - - public String getTransactionName(int transactionCode) { - return getDefaultTransactionName(transactionCode); - } - - @Override // android.os.Binder - public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { - if (code >= 1 && code <= 16777215) { - data.enforceInterface(IAONHECallbacks.DESCRIPTOR); - } - switch (code) { - case 1598968902: - reply.writeString(IAONHECallbacks.DESCRIPTOR); - return true; - default: - switch (code) { - case 1: - onOpened(); - break; - case 2: - onClosed(); - break; - case 3: - int _arg0 = data.readInt(); - data.enforceNoDataAvail(); - onError(_arg0); - break; - case 4: - onHEDetected(); - break; - default: - return super.onTransact(code, data, reply, flags); - } - return true; - } - } - - /* loaded from: classes.dex */ - private static class Proxy implements IAONHECallbacks { - private IBinder mRemote; - - Proxy(IBinder remote) { - this.mRemote = remote; - } - - @Override // android.os.IInterface - public IBinder asBinder() { - return this.mRemote; - } - - public String getInterfaceDescriptor() { - return IAONHECallbacks.DESCRIPTOR; - } - - @Override // android.hardware.IAONHECallbacks - public void onOpened() throws RemoteException { - Parcel _data = Parcel.obtain(asBinder()); - try { - _data.writeInterfaceToken(IAONHECallbacks.DESCRIPTOR); - this.mRemote.transact(1, _data, null, 1); - } finally { - _data.recycle(); - } - } - - @Override // android.hardware.IAONHECallbacks - public void onClosed() throws RemoteException { - Parcel _data = Parcel.obtain(asBinder()); - try { - _data.writeInterfaceToken(IAONHECallbacks.DESCRIPTOR); - this.mRemote.transact(2, _data, null, 1); - } finally { - _data.recycle(); - } - } - - @Override // android.hardware.IAONHECallbacks - public void onError(int errorCode) throws RemoteException { - Parcel _data = Parcel.obtain(asBinder()); - try { - _data.writeInterfaceToken(IAONHECallbacks.DESCRIPTOR); - _data.writeInt(errorCode); - this.mRemote.transact(3, _data, null, 1); - } finally { - _data.recycle(); - } - } - - @Override // android.hardware.IAONHECallbacks - public void onHEDetected() throws RemoteException { - Parcel _data = Parcel.obtain(asBinder()); - try { - _data.writeInterfaceToken(IAONHECallbacks.DESCRIPTOR); - this.mRemote.transact(4, _data, null, 1); - } finally { - _data.recycle(); - } - } - } - - public int getMaxTransactionId() { - return 3; - } - } -} diff --git a/oplus-fwk/src/android/hardware/camera2/IOplusCameraManager.java b/oplus-fwk/src/android/hardware/camera2/IOplusCameraManager.java deleted file mode 100644 index c4c72d5..0000000 --- a/oplus-fwk/src/android/hardware/camera2/IOplusCameraManager.java +++ /dev/null @@ -1,65 +0,0 @@ -package android.hardware.camera2; - -import android.common.IOplusCommonFeature; -import android.common.OplusFeatureList; -import android.content.Context; -import android.os.IBinder; - -/* loaded from: classes.dex */ -public interface IOplusCameraManager extends IOplusCommonFeature { - public static final IOplusCameraManager DEFAULT = new IOplusCameraManager() { // from class: android.hardware.camera2.IOplusCameraManager.1 - }; - public static final String NAME = "IOplusCameraManager"; - - /* loaded from: classes.dex */ - public enum Cmd { - CMD_NONE, - CMD_PRE_CAPTURE, - CMD_PRE_OPEN, - CMD_PRE_EVLIST - } - - //default OplusFeatureList.OplusIndex index() { - // return OplusFeatureList.OplusIndex.IOplusCameraManager; - //} - - default IOplusCommonFeature getDefault() { - return DEFAULT; - } - - default void addAuthResultInfo(Context context, int uid, int pid, int permBits, String packageName) { - } - - default void setDeathRecipient(IBinder client) { - } - - default boolean isAuthedClient(Context context) { - return false; - } - - default void preOpenCamera(Context context) { - } - - default void sendOplusExtCamCmd(Context context, Cmd cmd, int[] param) { - } - - default void setCallInfo() { - } - - default void saveOpPackageName(String packageName) { - } - - default void setPackageName() { - } - - default boolean isPrivilegedApp(String packageName) { - return false; - } - - default boolean isCameraUnitSession() { - return false; - } - - default void parseSessionParameters(CaptureRequest sessionParams) { - } -} diff --git a/oplus-fwk/src/android/hardware/camera2/OplusCameraManager.java b/oplus-fwk/src/android/hardware/camera2/OplusCameraManager.java index d2f5739..63a3eab 100644 --- a/oplus-fwk/src/android/hardware/camera2/OplusCameraManager.java +++ b/oplus-fwk/src/android/hardware/camera2/OplusCameraManager.java @@ -1,490 +1,105 @@ package android.hardware.camera2; -import android.app.OplusExSystemServiceHelper; import android.content.Context; -import android.hardware.IAONHECallbacks; -import android.hardware.camera2.CaptureRequest; -import android.hardware.camera2.IOplusCameraManager; -import android.hardware.camera2.impl.CameraMetadataNative; -import android.media.Image; -import android.media.ImageReader; -import android.os.Binder; import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.util.Log; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -/* loaded from: classes.dex */ -public final class OplusCameraManager implements IOplusCameraManager { - private static final String PERMISSION_SAFE_CAMERA = "com.oplus.permission.safe.CAMERA"; - private static final String TAG = "OplusCameraManager"; - private static final String SYSTEM_CAMERA_PACKNAME = SystemProperties.get("ro.oplus.system.camera.name"); - private static final CaptureRequest.Key KEY_OPLUS_PACKAGE = new CaptureRequest.Key<>("com.oplus.is.sdk.camera.package", byte[].class); - private static OplusCameraManager mInstance = new OplusCameraManager(); - private static String[] SET_PACKAGE_BLACK_LIST = {"com.oplus.battery", "com.oplus.onetrace", "com.android.systemui", "com.oplus.obrain", OplusExSystemServiceHelper.EX_SYSTEM_SERVICE_PKGNAME}; - private String mOpPackageName = ""; - private boolean mIsCameraUnitSession = false; - private boolean mbLoad = false; +public class OplusCameraManager { - public native int nativeSendToAttachHWBufToBufQEvent(long j); + private static OplusCameraManager sOplusCameraManager = null; - public native int nativeSendToBufQAllocEnableEvent(long j); - - public native int nativeSendToExchgHWBufBtwBufQEvent(long j); - - public native void nativtSendToProcessHeif(long j); - - private OplusCameraManager() { + public static OplusCameraManager getInstance() { + if (sOplusCameraManager == null) { + sOplusCameraManager = new OplusCameraManager(); + } + return sOplusCameraManager; } - private void checkLoadLibrary() { - Log.i(TAG, "checkLoadHeifLibbrary, mbLoad: " + this.mbLoad); - if (this.mbLoad) { - return; + public void preOpenCamera(Context context) { + if (context == null) { + throw new IllegalArgumentException("context was null"); } try { - System.loadLibrary("HeifWinBufExchg-jni"); - this.mbLoad = true; - } catch (Exception e) { + OplusCameraManagerGlobal.get().preOpenCamera(context.getOpPackageName()); + } catch (CameraAccessException | RemoteException e) { e.printStackTrace(); - Log.e(TAG, "checkLoadHeifLibbrary, error"); } } - public void sendToProcessHeif(long ptr) { - checkLoadLibrary(); - nativtSendToProcessHeif(ptr); - } - - public int sendToBufQAllocEnableEvent(long ptr) { - checkLoadLibrary(); - return nativeSendToBufQAllocEnableEvent(ptr); - } - - public int sendToExchgHWBufBtwBufQEvent(long ptr) { - checkLoadLibrary(); - return nativeSendToExchgHWBufBtwBufQEvent(ptr); - } - - public int sendToAttachHWBufToBufQEvent(long ptr) { - checkLoadLibrary(); - return nativeSendToAttachHWBufToBufQEvent(ptr); - } - - public static synchronized OplusCameraManager getInstance() { - OplusCameraManager oplusCameraManager; - synchronized (OplusCameraManager.class) { - oplusCameraManager = mInstance; - } - return oplusCameraManager; - } - - public static Object getEmptyCameraMetadataNative(long[] metadataPtr) { - CameraMetadataNative meta = new CameraMetadataNative(); - if (metadataPtr != null && metadataPtr.length > 0) { - metadataPtr[0] = meta.getMetadataPtr(); - } - return meta; - } - - public static TotalCaptureResult generateTotalCaptureResult(Object meta, long frameId) { - if (meta == null || !(meta instanceof CameraMetadataNative)) { - return null; - } - TotalCaptureResult r = new TotalCaptureResult((CameraMetadataNative) meta, 0); + public void setCallInfo() { try { - Field numField = CaptureResult.class.getDeclaredField("mFrameNumber"); - numField.setAccessible(true); - numField.setLong(r, frameId); - } catch (IllegalAccessException | NoSuchFieldException e) { + OplusCameraManagerGlobal.get().setCallInfo(); + } catch (CameraAccessException | RemoteException e) { e.printStackTrace(); } - return r; - } - - @Override // android.hardware.camera2.IOplusCameraManager - public void addAuthResultInfo(Context context, int uid, int pid, int permBits, String packageName) { - context.enforceCallingOrSelfPermission(PERMISSION_SAFE_CAMERA, TAG); - if (uid == 0) { - throw new IllegalArgumentException("uid was 0, which is illegal."); - } - if (pid == 0) { - throw new IllegalArgumentException("pid was 0, which is illegal."); - } - if (packageName == null) { - throw new IllegalArgumentException("packageName was null, which is illegal."); - } - try { - OplusCameraManagerGlobal.get().addAuthResultInfo(uid, pid, permBits, packageName); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } } - @Override // android.hardware.camera2.IOplusCameraManager public void setDeathRecipient(IBinder client) { if (client == null) { throw new IllegalArgumentException("client was null"); } try { OplusCameraManagerGlobal.get().setDeathRecipient(client); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - @Override // android.hardware.camera2.IOplusCameraManager - public boolean isAuthedClient(Context context) { - if (context == null) { - throw new IllegalArgumentException("context was null"); - } - try { - return OplusCameraManagerGlobal.get().isAuthedClient(context.getOpPackageName()); - } catch (CameraAccessException e) { - e.printStackTrace(); - return false; - } catch (RemoteException e2) { - e2.printStackTrace(); - return false; - } - } - - @Override // android.hardware.camera2.IOplusCameraManager - public void preOpenCamera(Context context) { - if (context == null) { - throw new IllegalArgumentException("context was null"); - } - context.enforceCallingOrSelfPermission(PERMISSION_SAFE_CAMERA, TAG); - try { - OplusCameraManagerGlobal.get().preOpenCamera(context.getOpPackageName()); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - @Override // android.hardware.camera2.IOplusCameraManager - public void sendOplusExtCamCmd(Context context, IOplusCameraManager.Cmd cmd, int[] param) { - if (context == null) { - throw new IllegalArgumentException("context was null"); - } - context.enforceCallingOrSelfPermission(PERMISSION_SAFE_CAMERA, TAG); - try { - OplusCameraManagerGlobal.get().sendOplusExtCamCmd(context.getOpPackageName(), cmd, param); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - @Override // android.hardware.camera2.IOplusCameraManager - public void setCallInfo() { - try { - OplusCameraManagerGlobal.get().setCallInfo(); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - @Override // android.hardware.camera2.IOplusCameraManager - public void saveOpPackageName(String packageName) { - this.mOpPackageName = packageName; - Log.i(TAG, "saveOpPackageName, mOpPackageName: " + this.mOpPackageName); - } - - @Override // android.hardware.camera2.IOplusCameraManager - public void setPackageName() { - String[] strArr; - for (String packageName : SET_PACKAGE_BLACK_LIST) { - if (packageName.equals(this.mOpPackageName)) { - return; - } - } - try { - OplusCameraManagerGlobal.get().setClientInfo(this.mOpPackageName, Binder.getCallingUid(), Binder.getCallingPid()); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - public void setRIOClientInfo() throws CameraAccessException { - Log.i(TAG, "uid = " + Binder.getCallingUid() + ", pid = " + Binder.getCallingPid()); - try { - OplusCameraManagerGlobal.get().setRIOClientInfo(Binder.getCallingUid(), Binder.getCallingPid()); - } catch (RemoteException e) { + } catch (CameraAccessException | RemoteException e) { e.printStackTrace(); } } - @Override // android.hardware.camera2.IOplusCameraManager - public boolean isPrivilegedApp(String packageName) { - String str; - if (packageName == null || (str = SYSTEM_CAMERA_PACKNAME) == null || !str.equals(packageName)) { - return false; - } - return true; - } + private static final class OplusCameraManagerGlobal implements IBinder.DeathRecipient { - public void setTorchIntensity(int torchIntensity) { - if (torchIntensity < 0) { - throw new IllegalArgumentException("torchIntensity was less than 0, which is illegal."); - } - try { - OplusCameraManagerGlobal.get().setTorchIntensity(torchIntensity); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - public void disconnectClients() { - try { - OplusCameraManagerGlobal.get().disconnectClients(); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - public boolean isClientConnected() { - try { - return OplusCameraManagerGlobal.get().isClientConnected(); - } catch (CameraAccessException e) { - e.printStackTrace(); - return false; - } catch (RemoteException e2) { - e2.printStackTrace(); - return false; - } - } - - @Override // android.hardware.camera2.IOplusCameraManager - public boolean isCameraUnitSession() { - return this.mIsCameraUnitSession; - } - - @Override // android.hardware.camera2.IOplusCameraManager - public void parseSessionParameters(CaptureRequest sessionParams) { - if (sessionParams == null) { - setIsCameraUnitSession(false); - return; - } - byte[] result = (byte[]) sessionParams.get(KEY_OPLUS_PACKAGE); - if (result == null || result.length == 0) { - setIsCameraUnitSession(false); - return; - } - if (1 == result[0]) { - setIsCameraUnitSession(true); - } - Log.i(TAG, "parseSessionParameters mIsCameraUnitSession: " + this.mIsCameraUnitSession); - } - - public void oplusDetachImage(Image image, ImageReader imgreader) { - try { - Method method = ImageReader.class.getDeclaredMethod("detachImage", Image.class); - method.setAccessible(true); - method.invoke(imgreader, image); - } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { - e.printStackTrace(); - } - Log.i(TAG, "using reflection to visit detachImage method in ImageReader"); - } - - public static void setOmojiJson(String jsonInfo) { - Log.i(TAG, "setOmojiJson called."); - if (jsonInfo == null || "".equals(jsonInfo)) { - Log.i(TAG, "jsonInfo is null"); - return; - } - try { - OplusCameraManagerGlobal.get().setOmojiJson(jsonInfo); - } catch (CameraAccessException e) { - Log.i(TAG, "setOmojiJson :" + e.getMessage()); - } catch (RemoteException e2) { - Log.i(TAG, "setOmojiJson :" + e2.getMessage()); - } - } - - public void closeAON() throws CameraAccessException { - Log.i(TAG, "uid = " + Binder.getCallingUid() + ", pid = " + Binder.getCallingPid()); - try { - OplusCameraManagerGlobal.get().closeAON(); - } catch (RemoteException e) { - e.printStackTrace(); - } - } - - public void openAON(IAONHECallbacks callback) throws CameraAccessException { - Log.i(TAG, "uid = " + Binder.getCallingUid() + ", pid = " + Binder.getCallingPid()); - try { - OplusCameraManagerGlobal.get().openAON(callback); - } catch (RemoteException e) { - e.printStackTrace(); - } - } - - private void setIsCameraUnitSession(boolean isCameraUnitSession) { - this.mIsCameraUnitSession = isCameraUnitSession; - try { - OplusCameraManagerGlobal.get().setIsCameraUnitSession(this.mIsCameraUnitSession); - } catch (CameraAccessException e) { - e.printStackTrace(); - } catch (RemoteException e2) { - e2.printStackTrace(); - } - } - - /* JADX INFO: Access modifiers changed from: private */ - /* loaded from: classes.dex */ - public static final class OplusCameraManagerGlobal implements IBinder.DeathRecipient { - private static final int ADD_AUTH_RESULT = 10001; - private static final String CAMERA_SERVICE_BINDER_NAME = "media.camera"; - private static final int CLIENT_IS_AUTHED = 10004; - private static final int CLOSE_AON = 10013; - private static final int CONNECT_STATUS = 10011; - private static final String DESCRIPTOR = "android.hardware.camera"; - private static final int DISCONNECT_CLIENTS = 10009; - private static final int OPEN_AON = 10012; - private static final int OPLUS_CAMERA_FIRST_CALL_TRANSACTION = 10000; - private static final int PRE_OPEN_CAMERA = 10014; - private static final int SEND_OPLUS_EXT_CAM_CMD = 10015; - private static final int SET_CALL_INFO = 10006; - private static final int SET_CLIENT_INFO = 10005; - private static final int SET_DEATH_RECIPIENT = 10002; - private static final int SET_IS_CAMERA_UNIT_SESSION = 10016; - private static final int SET_OMOJI_JSON = 10010; - private static final int SET_PACKAGE_NAME = 10003; - private static final int SET_RIO_CLIENT_INFO = 10007; - private static final int SET_TORCH_INTENSITY = 10008; private static final String TAG = "OplusCameraManagerGlobal"; - private static final OplusCameraManagerGlobal gCameraManager = new OplusCameraManagerGlobal(); - public static final boolean sCameraServiceDisabled = SystemProperties.getBoolean("config.disable_cameraservice", false); - private final boolean DEBUG = false; + + private static final String CAMERA_SERVICE_BINDER_NAME = "media.camera"; + private static final String DESCRIPTOR = "android.hardware.media"; + + private static final int SET_DEATH_RECIPIENT = 10002; + private static final int SET_CALL_INFO = 10006; + private static final int PRE_OPEN_CAMERA = 10012; + + private static final OplusCameraManagerGlobal gOplusCameraManagerGlobal = + new OplusCameraManagerGlobal(); + + private static final boolean sCameraServiceDisabled = + SystemProperties.getBoolean("config.disable_cameraservice", false); + private final Object mLock = new Object(); + private IBinder mRemote = null; - private OplusCameraManagerGlobal() { - } - public static OplusCameraManagerGlobal get() { - return gCameraManager; + return gOplusCameraManagerGlobal; } private void connectCameraServiceLocked() { - if (this.mRemote != null || sCameraServiceDisabled) { + if (mRemote != null || sCameraServiceDisabled) { return; } - Log.i(TAG, "Connecting to camera service"); - IBinder service = ServiceManager.getService(CAMERA_SERVICE_BINDER_NAME); - this.mRemote = service; - if (service == null) { - return; - } - try { - service.linkToDeath(this, 0); - } catch (RemoteException e) { + mRemote = ServiceManager.getService(CAMERA_SERVICE_BINDER_NAME); + if (mRemote != null) { + try { + mRemote.linkToDeath(this, 0); + } catch (RemoteException e) { + Log.e(TAG, "link to death failed"); + } } } public IBinder getCameraServiceRemote() { - IBinder iBinder; - synchronized (this.mLock) { + synchronized (mLock) { connectCameraServiceLocked(); - if (this.mRemote == null && !sCameraServiceDisabled) { + if (mRemote == null && !sCameraServiceDisabled) { Log.e(TAG, "Camera service is unavailable"); } - iBinder = this.mRemote; - } - return iBinder; - } - - public void addAuthResultInfo(int uid, int pid, int permBits, String packageName) throws CameraAccessException, RemoteException { - Log.e(TAG, "addAuthResultInfo"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeInt(uid); - data.writeInt(pid); - data.writeInt(permBits); - data.writeString(packageName); - this.mRemote.transact(10001, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public void setDeathRecipient(IBinder client) throws CameraAccessException, RemoteException { - Log.e(TAG, "setDeathRecipient"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeStrongBinder(client); - this.mRemote.transact(10002, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public boolean isAuthedClient(String packageName) throws CameraAccessException, RemoteException { - Log.e(TAG, "isAuthedClient, need check packageName: " + packageName); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeString(packageName); - this.mRemote.transact(10004, data, reply, 0); - reply.readException(); - boolean isAuthed = reply.readBoolean(); - data.recycle(); - reply.recycle(); - Log.e(TAG, "isAuthedClient, the " + packageName + " is Authed " + isAuthed); - return isAuthed; - } catch (Throwable th) { - data.recycle(); - reply.recycle(); - throw th; } + return mRemote; } public void preOpenCamera(String packageName) throws CameraAccessException, RemoteException { - Log.e(TAG, "preOpenCamera, need check packageName: " + packageName); - IBinder remote = getCameraServiceRemote(); + final IBinder remote = getCameraServiceRemote(); if (remote == null) { throw new CameraAccessException(2, "Camera service is currently unavailable"); } @@ -493,35 +108,11 @@ public final class OplusCameraManager implements IOplusCameraManager { try { data.writeInterfaceToken(DESCRIPTOR); data.writeInt(1); - this.mRemote.transact(10014, data, reply, 0); + mRemote.transact(PRE_OPEN_CAMERA, data, reply, 0); reply.readException(); data.recycle(); reply.recycle(); - Log.e(TAG, "preOpenCamera, the " + packageName + " preOpenSend "); - } catch (Throwable th) { - data.recycle(); - reply.recycle(); - throw th; - } - } - - public void sendOplusExtCamCmd(String packageName, IOplusCameraManager.Cmd cmd, int[] param) throws CameraAccessException, RemoteException { - Log.e(TAG, "sendOplusExtCamCmd, packageName: " + packageName + ", cmd: " + cmd); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeInt(cmd.ordinal()); - data.writeIntArray(param); - this.mRemote.transact(10015, data, reply, 1); - reply.readException(); - data.recycle(); - reply.recycle(); - Log.e(TAG, "sendOplusExtCamCmd complete "); + Log.i(TAG, "preOpenCamera, the " + packageName + " preOpenSend"); } catch (Throwable th) { data.recycle(); reply.recycle(); @@ -530,8 +121,7 @@ public final class OplusCameraManager implements IOplusCameraManager { } public void setCallInfo() throws CameraAccessException, RemoteException { - Log.e(TAG, "setCallInfo"); - IBinder remote = getCameraServiceRemote(); + final IBinder remote = getCameraServiceRemote(); if (remote == null) { throw new CameraAccessException(2, "Camera service is currently unavailable"); } @@ -539,7 +129,7 @@ public final class OplusCameraManager implements IOplusCameraManager { Parcel reply = Parcel.obtain(); try { data.writeInterfaceToken(DESCRIPTOR); - this.mRemote.transact(10006, data, reply, 0); + mRemote.transact(SET_CALL_INFO, data, reply, 0); reply.readException(); } finally { data.recycle(); @@ -547,9 +137,8 @@ public final class OplusCameraManager implements IOplusCameraManager { } } - public void setPackageName(String packageName) throws CameraAccessException, RemoteException { - Log.i(TAG, "setPackageName"); - IBinder remote = getCameraServiceRemote(); + public void setDeathRecipient(IBinder client) throws CameraAccessException, RemoteException { + final IBinder remote = getCameraServiceRemote(); if (remote == null) { throw new CameraAccessException(2, "Camera service is currently unavailable"); } @@ -557,8 +146,8 @@ public final class OplusCameraManager implements IOplusCameraManager { Parcel reply = Parcel.obtain(); try { data.writeInterfaceToken(DESCRIPTOR); - data.writeString(packageName); - remote.transact(10003, data, reply, 0); + data.writeStrongBinder(client); + mRemote.transact(SET_DEATH_RECIPIENT, data, reply, 0); reply.readException(); } finally { data.recycle(); @@ -566,192 +155,9 @@ public final class OplusCameraManager implements IOplusCameraManager { } } - public void setClientInfo(String packageName, int uid, int pid) throws CameraAccessException, RemoteException { - Log.i(TAG, "setClientInfo, packageName: " + packageName + ", uid: " + uid + ", pid: " + pid); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeString(packageName); - data.writeInt(uid); - data.writeInt(pid); - remote.transact(10005, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public void setRIOClientInfo(int uid, int pid) throws CameraAccessException, RemoteException { - Log.i(TAG, "uid: " + uid + ", pid: " + pid); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeInt(uid); - data.writeInt(pid); - remote.transact(10007, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public void setOmojiJson(String atavatarInfo) throws CameraAccessException, RemoteException { - Log.i(TAG, "setOmojiJson E"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeString(atavatarInfo); - Log.i(TAG, "setOmojiJson process E"); - this.mRemote.transact(10010, data, reply, 0); - Log.i(TAG, "setOmojiJson process X"); - reply.readException(); - data.recycle(); - reply.recycle(); - Log.i(TAG, "setOmojiJson X"); - } catch (Throwable th) { - data.recycle(); - reply.recycle(); - throw th; - } - } - - public void setTorchIntensity(int torchIntensity) throws CameraAccessException, RemoteException { - Log.d(TAG, "setTorchIntensity: " + torchIntensity); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeInt(torchIntensity); - remote.transact(10008, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public void disconnectClients() throws CameraAccessException, RemoteException { - Log.e(TAG, "disconnectClients"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - this.mRemote.transact(10009, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public boolean isClientConnected() throws CameraAccessException, RemoteException { - Log.e(TAG, "isClientConnected"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - this.mRemote.transact(10011, data, reply, 0); - reply.readException(); - boolean isConnected = reply.readBoolean(); - data.recycle(); - reply.recycle(); - Log.e(TAG, "isClientConnected: " + isConnected); - return isConnected; - } catch (Throwable th) { - data.recycle(); - reply.recycle(); - throw th; - } - } - - public void openAON(IAONHECallbacks callback) throws CameraAccessException, RemoteException { - Log.i(TAG, "openAON E"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeStrongBinder(callback.asBinder()); - remote.transact(10012, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public void closeAON() throws CameraAccessException, RemoteException { - Log.i(TAG, "closeAON E"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - remote.transact(10013, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - public void setIsCameraUnitSession(boolean isCameraUnitSession) throws CameraAccessException, RemoteException { - Log.i(TAG, "setIsCameraUnitSession E"); - IBinder remote = getCameraServiceRemote(); - if (remote == null) { - throw new CameraAccessException(2, "Camera service is currently unavailable"); - } - Parcel data = Parcel.obtain(); - Parcel reply = Parcel.obtain(); - try { - data.writeInterfaceToken(DESCRIPTOR); - data.writeBoolean(isCameraUnitSession); - remote.transact(10016, data, reply, 0); - reply.readException(); - } finally { - data.recycle(); - reply.recycle(); - } - } - - @Override // android.os.IBinder.DeathRecipient + @Override public void binderDied() { - this.mRemote = null; + mRemote = null; } } } diff --git a/oplus-fwk/src/android/view/OplusWindowManager.java b/oplus-fwk/src/android/view/OplusWindowManager.java index c22e5fa..d087364 100644 --- a/oplus-fwk/src/android/view/OplusWindowManager.java +++ b/oplus-fwk/src/android/view/OplusWindowManager.java @@ -1,6 +1,8 @@ -package android.view; - -public class OplusWindowManager { - - public OplusWindowManager() {} -} +package android.view; + +public class OplusWindowManager { + + public OplusWindowManager() {} + + public void requestKeyguard(String command) {} +} diff --git a/oplus-fwk/src/android/view/animation/OplusBezierInterpolator.java b/oplus-fwk/src/android/view/animation/OplusBezierInterpolator.java index c2f5d55..69d39e3 100644 --- a/oplus-fwk/src/android/view/animation/OplusBezierInterpolator.java +++ b/oplus-fwk/src/android/view/animation/OplusBezierInterpolator.java @@ -1,61 +1,29 @@ package android.view.animation; -import android.content.Context; -import android.content.res.Resources; -import android.util.AttributeSet; - public class OplusBezierInterpolator extends BaseInterpolator { - private final float ABOVE_ONE; - private final float ABOVE_ZERO; - private final float BELOW_ONE; - private final boolean DEBUG; - private final double EPSILON; - private final String TAG; - private boolean mAbove; - private boolean mLimit; + + private static final float ABOVE_ZERO = 0.0001f; + private static final float BELOW_ONE = 0.9999f; + + private static final double ABOVE_ONE = 1.0d; + private static final double EPSILON = 0.0000625d; + private OplusUnitBezier mOplusUnitBezier; - public OplusBezierInterpolator(Context context, AttributeSet attrs) { - this(context.getResources(), context.getTheme(), attrs); - } - - public OplusBezierInterpolator(Resources res, Resources.Theme theme, AttributeSet attrs) { - this.TAG = "OplusBezierInterpolator"; - this.DEBUG = false; - this.EPSILON = 6.25E-5d; - this.ABOVE_ONE = 1.0f; - this.BELOW_ONE = 0.9999f; - this.ABOVE_ZERO = 1.0E-4f; - this.mAbove = false; - this.mLimit = false; - } + private boolean mLimit; public OplusBezierInterpolator(double p1x, double p1y, double p2x, double p2y, boolean limit) { - this.TAG = "OplusBezierInterpolator"; - this.DEBUG = false; - this.EPSILON = 6.25E-5d; - this.ABOVE_ONE = 1.0f; - this.BELOW_ONE = 0.9999f; - this.ABOVE_ZERO = 1.0E-4f; - this.mAbove = false; - this.mLimit = false; - this.mLimit = limit; - this.mOplusUnitBezier = new OplusUnitBezier(p1x, p1y, p2x, p2y); + mLimit = limit; + mOplusUnitBezier = new OplusUnitBezier(p1x, p1y, p2x, p2y); } @Override public float getInterpolation(float input) { - double interpolation = this.mOplusUnitBezier.solve(input, 6.25E-5d); - if (this.mLimit) { - if (input < 1.0E-4f || input > 0.9999f) { - this.mAbove = false; - } - if (interpolation > 1.0d && !this.mAbove) { - interpolation = 1.0d; - this.mAbove = true; - } - if (this.mAbove) { - interpolation = 1.0d; + double interpolation = mOplusUnitBezier.solve(input, EPSILON); + if (mLimit) { + final boolean above = input >= ABOVE_ZERO && input <= BELOW_ONE; + if (interpolation > ABOVE_ONE && !above) { + interpolation = ABOVE_ONE; } } return (float) interpolation; diff --git a/oplus-fwk/src/android/view/animation/OplusUnitBezier.java b/oplus-fwk/src/android/view/animation/OplusUnitBezier.java index 2b288c2..a4bde91 100644 --- a/oplus-fwk/src/android/view/animation/OplusUnitBezier.java +++ b/oplus-fwk/src/android/view/animation/OplusUnitBezier.java @@ -2,73 +2,74 @@ package android.view.animation; public class OplusUnitBezier { - private double f5ax; - private double f6ay; - private double f7bx; - private double f8by; - private double f9cx; - private double f10cy; + private double ax; + private double ay; + private double bx; + private double by; + private double cx; + private double cy; public OplusUnitBezier(double p1x, double p1y, double p2x, double p2y) { - double d = p1x * 3.0d; - this.f9cx = d; - double d2 = ((p2x - p1x) * 3.0d) - d; - this.f7bx = d2; - this.f5ax = (1.0d - d) - d2; - double d3 = p1y * 3.0d; - this.f10cy = d3; - double d4 = ((p2y - p1y) * 3.0d) - d3; - this.f8by = d4; - this.f6ay = (1.0d - d3) - d4; + final double d = p1x * 3.0d; + final double d2 = (p2x - p1x) * 3.0d - d; + final double d3 = p1y * 3.0d; + final double d4 = (p2y - p1y) * 3.0d - d3; + + ax = (1.0d - d) - d2; + ay = (1.0d - d3) - d4; + bx = d2; + by = d4; + cx = d; + cy = d3; } public double sampleCurveX(double t) { - return ((((this.f5ax * t) + this.f7bx) * t) + this.f9cx) * t; + return ((ax * t + bx) * t + cx) * t; } public double sampleCurveY(double t) { - return ((((this.f6ay * t) + this.f8by) * t) + this.f10cy) * t; + return ((ay * t + by) * t + cy) * t; } public double sampleCurveDerivativeX(double t) { - return (((this.f5ax * 3.0d * t) + (this.f7bx * 2.0d)) * t) + this.f9cx; + return (ax * 3.0d * t + bx * 2.0d) * t + cx; } public double solveCurveX(double x, double epsilon) { - double t2 = x; + double t = x; for (int i = 0; i < 8; i++) { - double x2 = sampleCurveX(t2) - x; + double x2 = sampleCurveX(t) - x; if (Math.abs(x2) < epsilon) { - return t2; + return t; } - double d2 = sampleCurveDerivativeX(t2); - if (Math.abs(d2) < 1.0E-6d) { + double d2 = sampleCurveDerivativeX(t); + if (Math.abs(d2) < 0.000001d) { break; } - t2 -= x2 / d2; + t -= x2 / d2; } double t0 = 0.0d; double t1 = 1.0d; - double t22 = x; - if (t22 < 0.0d) { + double t2 = x; + if (t2 < 0.0d) { return 0.0d; } - if (t22 > 1.0d) { + if (t2 > 1.0d) { return 1.0d; } while (t0 < t1) { - double x22 = sampleCurveX(t22); - if (Math.abs(x22 - x) < epsilon) { - return t22; + double x2 = sampleCurveX(t2); + if (Math.abs(x2 - x) < epsilon) { + return t2; } - if (x > x22) { - t0 = t22; + if (x > x2) { + t0 = t2; } else { - t1 = t22; + t1 = t2; } - t22 = ((t1 - t0) * 0.5d) + t0; + t2 = (t1 - t0) * 0.5d + t0; } - return t22; + return t2; } public double solve(double x, double epsilon) { diff --git a/oplus-fwk/src/com/oplus/app/OplusAppEnterInfo.java b/oplus-fwk/src/com/oplus/app/OplusAppEnterInfo.java index 0cbf7dc..b86bd9e 100644 --- a/oplus-fwk/src/com/oplus/app/OplusAppEnterInfo.java +++ b/oplus-fwk/src/com/oplus/app/OplusAppEnterInfo.java @@ -1,6 +1,6 @@ -package com.oplus.app; - -public class OplusAppEnterInfo { - - public OplusAppEnterInfo() {} -} +package com.oplus.app; + +public class OplusAppEnterInfo { + + public OplusAppEnterInfo() {} +} diff --git a/oplus-fwk/src/com/oplus/app/OplusAppExitInfo.java b/oplus-fwk/src/com/oplus/app/OplusAppExitInfo.java index 1909933..7517a98 100644 --- a/oplus-fwk/src/com/oplus/app/OplusAppExitInfo.java +++ b/oplus-fwk/src/com/oplus/app/OplusAppExitInfo.java @@ -1,6 +1,6 @@ -package com.oplus.app; - -public class OplusAppExitInfo { - - public OplusAppExitInfo() {} -} +package com.oplus.app; + +public class OplusAppExitInfo { + + public OplusAppExitInfo() {} +} diff --git a/oplus-fwk/src/com/oplus/app/OplusAppInfo.java b/oplus-fwk/src/com/oplus/app/OplusAppInfo.java index 2a73c23..e5f63af 100644 --- a/oplus-fwk/src/com/oplus/app/OplusAppInfo.java +++ b/oplus-fwk/src/com/oplus/app/OplusAppInfo.java @@ -1,6 +1,6 @@ -package com.oplus.app; - -public class OplusAppInfo { - - public OplusAppInfo() {} -} +package com.oplus.app; + +public class OplusAppInfo { + + public OplusAppInfo() {} +} diff --git a/oplus-fwk/src/com/oplus/app/OplusAppSwitchConfig.java b/oplus-fwk/src/com/oplus/app/OplusAppSwitchConfig.java index 82d9cbc..c7b5da0 100644 --- a/oplus-fwk/src/com/oplus/app/OplusAppSwitchConfig.java +++ b/oplus-fwk/src/com/oplus/app/OplusAppSwitchConfig.java @@ -1,8 +1,8 @@ -package com.oplus.app; - -import java.util.List; - -public class OplusAppSwitchConfig { - - public void addAppConfig(int type, List list) {} -} +package com.oplus.app; + +import java.util.List; + +public class OplusAppSwitchConfig { + + public void addAppConfig(int type, List list) {} +} diff --git a/oplus-fwk/src/com/oplus/app/OplusAppSwitchManager.java b/oplus-fwk/src/com/oplus/app/OplusAppSwitchManager.java index 691ed00..b120b85 100644 --- a/oplus-fwk/src/com/oplus/app/OplusAppSwitchManager.java +++ b/oplus-fwk/src/com/oplus/app/OplusAppSwitchManager.java @@ -1,37 +1,37 @@ -package com.oplus.app; - -import android.content.Context; - -public class OplusAppSwitchManager { - - private static OplusAppSwitchManager sOplusAppSwitchManager = null; - - public static int APP_SWITCH_VERSION = 1; - - public static OplusAppSwitchManager getInstance() { - if (sOplusAppSwitchManager == null) { - sOplusAppSwitchManager = new OplusAppSwitchManager(); - } - return sOplusAppSwitchManager; - } - - public boolean registerAppSwitchObserver(Context context, - OnAppSwitchObserver observer, OplusAppSwitchConfig config) { - return true; - } - - public boolean unregisterAppSwitchObserver(Context context, OnAppSwitchObserver observer) { - return true; - } - - public interface OnAppSwitchObserver { - - void onActivityEnter(OplusAppEnterInfo oplusAppEnterInfo); - - void onActivityExit(OplusAppExitInfo oplusAppExitInfo); - - void onAppEnter(OplusAppEnterInfo oplusAppEnterInfo); - - void onAppExit(OplusAppExitInfo oplusAppExitInfo); - } -} +package com.oplus.app; + +import android.content.Context; + +public class OplusAppSwitchManager { + + private static OplusAppSwitchManager sOplusAppSwitchManager = null; + + public static int APP_SWITCH_VERSION = 1; + + public static OplusAppSwitchManager getInstance() { + if (sOplusAppSwitchManager == null) { + sOplusAppSwitchManager = new OplusAppSwitchManager(); + } + return sOplusAppSwitchManager; + } + + public boolean registerAppSwitchObserver(Context context, + OnAppSwitchObserver observer, OplusAppSwitchConfig config) { + return true; + } + + public boolean unregisterAppSwitchObserver(Context context, OnAppSwitchObserver observer) { + return true; + } + + public interface OnAppSwitchObserver { + + void onActivityEnter(OplusAppEnterInfo oplusAppEnterInfo); + + void onActivityExit(OplusAppExitInfo oplusAppExitInfo); + + void onAppEnter(OplusAppEnterInfo oplusAppEnterInfo); + + void onAppExit(OplusAppExitInfo oplusAppExitInfo); + } +} diff --git a/oplus-fwk/src/com/oplus/content/OplusFeatureConfigManager.java b/oplus-fwk/src/com/oplus/content/OplusFeatureConfigManager.java index 220e948..53d0e7c 100644 --- a/oplus-fwk/src/com/oplus/content/OplusFeatureConfigManager.java +++ b/oplus-fwk/src/com/oplus/content/OplusFeatureConfigManager.java @@ -1,20 +1,31 @@ -package com.oplus.content; - -public class OplusFeatureConfigManager { - - public static OplusFeatureConfigManager sOplusFeatureConfigManager = null; - - public static OplusFeatureConfigManager getInstance() { - if (sOplusFeatureConfigManager == null) { - sOplusFeatureConfigManager = new OplusFeatureConfigManager(); - } - return sOplusFeatureConfigManager; - } - - public boolean hasFeature(String name) { - if ("oplus.software.vibrator_lmvibrator".equals(name)) { - return true; - } - return false; - } -} +package com.oplus.content; + +import android.os.SystemProperties; +import android.text.TextUtils; + +public class OplusFeatureConfigManager { + + public static OplusFeatureConfigManager sOplusFeatureConfigManager = null; + + public static OplusFeatureConfigManager getInstance() { + if (sOplusFeatureConfigManager == null) { + sOplusFeatureConfigManager = new OplusFeatureConfigManager(); + } + return sOplusFeatureConfigManager; + } + + public boolean hasFeature(String name) { + if ("oplus.software.vibrator_lmvibrator".equals(name)) { + // OnePlus 7/8 series use old OnePlus base camera. Don't let this feature break haptic feedback. + if (useOnePlusBaseCamera()) { + return false; + } + return true; + } + return false; + } + + private static boolean useOnePlusBaseCamera() { + return !TextUtils.isEmpty(SystemProperties.get("ro.oplus.version.base")); + } +} diff --git a/oplus-fwk/src/com/oplus/flexiblewindow/FlexibleTaskView.java b/oplus-fwk/src/com/oplus/flexiblewindow/FlexibleTaskView.java new file mode 100644 index 0000000..d865f8b --- /dev/null +++ b/oplus-fwk/src/com/oplus/flexiblewindow/FlexibleTaskView.java @@ -0,0 +1,38 @@ +package com.oplus.flexiblewindow; + +import android.content.ComponentName; +import android.content.Context; +import android.graphics.Rect; +import android.graphics.Region; +import android.util.AttributeSet; +import android.view.SurfaceView; + +public class FlexibleTaskView extends SurfaceView { + + public FlexibleTaskView(Context context) { + this(context, null); + } + + public FlexibleTaskView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public FlexibleTaskView(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public FlexibleTaskView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes, true); + } + + public interface Listener { + default void onInitialized(boolean isStartSuccess) {} + default void onReleased() {} + default void onTaskCreated(int taskId, ComponentName name) {} + default void onTaskChanged(int taskId, ComponentName name, Rect rect) {} + default void onTaskVisbilityChanged(int taskId, boolean visible) {} + default void onTaskRemovalStarted(int taskId) {} + default void onBackPressedOnTaskRoot(int taskId) {} + default void updateTouchRegion(Region region) {} + } +} diff --git a/oplus-fwk/src/com/oplus/orms/OplusResourceManager.java b/oplus-fwk/src/com/oplus/orms/OplusResourceManager.java index c0800c9..6c75b27 100644 --- a/oplus-fwk/src/com/oplus/orms/OplusResourceManager.java +++ b/oplus-fwk/src/com/oplus/orms/OplusResourceManager.java @@ -1,19 +1,19 @@ -package com.oplus.orms; - -import com.oplus.orms.info.OrmsSaParam; - -public class OplusResourceManager { - - private static OplusResourceManager sOplusResourceManager = null; - - public static OplusResourceManager getInstance(Class clazz) { - if (sOplusResourceManager == null) { - sOplusResourceManager = new OplusResourceManager(); - } - return sOplusResourceManager; - } - - public long ormsSetSceneAction(OrmsSaParam ormsSaParam) { - return -1L; - } -} +package com.oplus.orms; + +import com.oplus.orms.info.OrmsSaParam; + +public class OplusResourceManager { + + private static OplusResourceManager sOplusResourceManager = null; + + public static OplusResourceManager getInstance(Class clazz) { + if (sOplusResourceManager == null) { + sOplusResourceManager = new OplusResourceManager(); + } + return sOplusResourceManager; + } + + public long ormsSetSceneAction(OrmsSaParam ormsSaParam) { + return -1L; + } +} diff --git a/oplus-fwk/src/com/oplus/orms/info/OrmsSaParam.java b/oplus-fwk/src/com/oplus/orms/info/OrmsSaParam.java index 1e49be4..ade8296 100644 --- a/oplus-fwk/src/com/oplus/orms/info/OrmsSaParam.java +++ b/oplus-fwk/src/com/oplus/orms/info/OrmsSaParam.java @@ -1,8 +1,8 @@ -package com.oplus.orms.info; - -public class OrmsSaParam { - - public OrmsSaParam() {} - - public OrmsSaParam(String scene, String action, int timeout) {} -} +package com.oplus.orms.info; + +public class OrmsSaParam { + + public OrmsSaParam() {} + + public OrmsSaParam(String scene, String action, int timeout) {} +} diff --git a/oplus-fwk/src/com/oplus/os/OplusBuild.java b/oplus-fwk/src/com/oplus/os/OplusBuild.java index 289a66b..f0f86ea 100644 --- a/oplus-fwk/src/com/oplus/os/OplusBuild.java +++ b/oplus-fwk/src/com/oplus/os/OplusBuild.java @@ -1,15 +1,18 @@ -package com.oplus.os; - -public class OplusBuild { - public static final int OplusOS_11_3 = 22; - - public static int getOplusOSVERSION() { - return 23; - } - - public static class VERSION { - public static final String RELEASE = "unknown"; - public static final int SDK_VERSION = getOplusOSVERSION(); - public static final int SDK_SUB_VERSION = 1; - } -} +package com.oplus.os; + +public class OplusBuild { + + public static final int OplusOS_11_3 = 22; + + public static int getOplusOSVERSION() { + return 23; + } + + public static class VERSION { + public static final String RELEASE = "unknown"; + + public static final int SDK_VERSION = getOplusOSVERSION(); + public static final int SDK_SUB_VERSION = 1; + } + +} diff --git a/oplus-fwk/src/com/oplus/os/OplusUsbEnvironment.java b/oplus-fwk/src/com/oplus/os/OplusUsbEnvironment.java index 55afb7a..88dbb0e 100644 --- a/oplus-fwk/src/com/oplus/os/OplusUsbEnvironment.java +++ b/oplus-fwk/src/com/oplus/os/OplusUsbEnvironment.java @@ -1,156 +1,158 @@ -package com.oplus.os; - -import android.content.Context; -import android.os.Environment; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.os.UserHandle; -import android.os.storage.DiskInfo; -import android.os.storage.IStorageManager; -import android.os.storage.StorageManager; -import android.os.storage.VolumeInfo; -import android.util.Log; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -public class OplusUsbEnvironment extends Environment { - - private static final String TAG = "OplusUsbEnvironment"; - private static final String DEFAULT_INTERNAL_PATH = "/storage/emulated/0"; - - private static IStorageManager sMountService = null; - private static Object sLock = new Object(); - private static String sExternalSdDir = null; - private static String sInternalSdDir = DEFAULT_INTERNAL_PATH; - private static ArrayList sOtgPathes = new ArrayList<>(); - - private static void update(Context context) { - if (sMountService == null) { - sMountService = IStorageManager.Stub.asInterface(ServiceManager.getService("mount")); - } - getVolumes(); - } - - public static File getExternalSdDirectory(Context context) { - String path; - synchronized (sLock) { - update(context); - path = sExternalSdDir; - } - if (path == null) { - return null; - } - return new File(path); - } - - public static String getExternalSdState(Context context) { - String path; - final StorageManager sm = (StorageManager) context.getSystemService("storage"); - synchronized (sLock) { - update(context); - path = sExternalSdDir; - } - if (path == null || sm == null) { - return "unknown"; - } - return sm.getVolumeState(path); - } - - public static String getExternalPath(Context context) { - String path; - synchronized (sLock) { - update(context); - path = sExternalSdDir; - } - return path; - } - - public static File getInternalSdDirectory(Context context) { - String path; - synchronized (sLock) { - update(context); - path = sInternalSdDir; - } - if (path == null) { - return null; - } - return new File(path); - } - - public static String getInternalSdState(Context context) { - String path; - final StorageManager sm = (StorageManager) context.getSystemService("storage"); - synchronized (sLock) { - update(context); - path = sInternalSdDir; - } - if (path == null || sm == null) { - return "unknown"; - } - return sm.getVolumeState(path); - } - - public static String getInternalPath(Context context) { - String path; - synchronized (sLock) { - update(context); - path = sInternalSdDir; - } - return path; - } - - public static List getOtgPath(Context context) { - synchronized (sLock) { - update(context); - if (sOtgPathes == null) { - return null; - } - return (ArrayList) sOtgPathes.clone(); - } - } - - public static void getVolumes() { - if (sMountService == null) { - Log.e(TAG, "getVolumes: sMountService is null!!!"); - return; - } - try { - final VolumeInfo[] vols = sMountService.getVolumes(0); - sExternalSdDir = null; - sOtgPathes.clear(); - for (VolumeInfo vol : vols) { - final String path = vol.path; - if (vol.type == 2) { - final int userId = UserHandle.myUserId(); - if (path != null) { - sInternalSdDir = path.concat("/").concat(Integer.toString(userId)); - } - } else { - final DiskInfo diskInfo = vol.getDisk(); - if (diskInfo != null) { - if (diskInfo.isSd() && path != null) { - sExternalSdDir = path; - } - if (diskInfo.isUsb() && path != null && !sOtgPathes.contains(path)) { - sOtgPathes.add(path); - } - } - } - } - } catch (RemoteException e) { - } - } - - public static boolean isVolumeMounted(Context context, String path) { - synchronized (sLock) { - update(context); - } - final StorageManager sm = (StorageManager) context.getSystemService("storage"); - if (path == null || sm == null) { - return false; - } - return "mounted".equals(sm.getVolumeState(path)); - } -} +package com.oplus.os; + +import android.content.Context; +import android.os.Environment; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.os.UserHandle; +import android.os.storage.DiskInfo; +import android.os.storage.IStorageManager; +import android.os.storage.StorageManager; +import android.os.storage.VolumeInfo; +import android.util.Log; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class OplusUsbEnvironment extends Environment { + + private static final String TAG = "OplusUsbEnvironment"; + private static final String DEFAULT_INTERNAL_PATH = "/storage/emulated/0"; + + private static IStorageManager sMountService = null; + private static Object sLock = new Object(); + private static String sExternalSdDir = null; + private static String sInternalSdDir = DEFAULT_INTERNAL_PATH; + private static ArrayList sOtgPathes = new ArrayList<>(); + + private static void update(Context context) { + if (sMountService == null) { + sMountService = IStorageManager.Stub.asInterface(ServiceManager.getService("mount")); + } + getVolumes(); + } + + public static File getExternalSdDirectory(Context context) { + String path; + synchronized (sLock) { + update(context); + path = sExternalSdDir; + } + if (path == null) { + return null; + } + return new File(path); + } + + public static String getExternalSdState(Context context) { + String path; + final StorageManager sm = context.getSystemService(StorageManager.class); + synchronized (sLock) { + update(context); + path = sExternalSdDir; + } + if (path == null || sm == null) { + return "unknown"; + } + return sm.getVolumeState(path); + } + + + public static String getExternalPath(Context context) { + String path; + synchronized (sLock) { + update(context); + path = sExternalSdDir; + } + return path; + } + + public static File getInternalSdDirectory(Context context) { + String path; + synchronized (sLock) { + update(context); + path = sInternalSdDir; + } + if (path == null) { + return null; + } + return new File(path); + } + + public static String getInternalSdState(Context context) { + String path; + final StorageManager sm = context.getSystemService(StorageManager.class); + synchronized (sLock) { + update(context); + path = sInternalSdDir; + } + if (path == null || sm == null) { + return "unknown"; + } + return sm.getVolumeState(path); + } + + + public static String getInternalPath(Context context) { + String path; + synchronized (sLock) { + update(context); + path = sInternalSdDir; + } + return path; + } + + public static List getOtgPath(Context context) { + synchronized (sLock) { + update(context); + if (sOtgPathes == null) { + return null; + } + return (ArrayList) sOtgPathes.clone(); + } + } + + public static void getVolumes() { + if (sMountService == null) { + Log.e(TAG, "getVolumes: sMountService is null!!!"); + return; + } + try { + final VolumeInfo[] vols = sMountService.getVolumes(0); + sExternalSdDir = null; + sOtgPathes.clear(); + for (VolumeInfo vol : vols) { + final String path = vol.path; + if (vol.type == 2) { + final int userId = UserHandle.myUserId(); + if (path != null) { + sInternalSdDir = path.concat("/").concat(Integer.toString(userId)); + } + } else { + final DiskInfo diskInfo = vol.getDisk(); + if (diskInfo != null) { + if (diskInfo.isSd() && path != null) { + sExternalSdDir = path; + } + if (diskInfo.isUsb() && path != null && !sOtgPathes.contains(path)) { + sOtgPathes.add(path); + } + } + } + } + } catch (RemoteException e) { + } + } + + public static boolean isVolumeMounted(Context context, String path) { + synchronized (sLock) { + update(context); + } + final StorageManager sm = context.getSystemService(StorageManager.class); + if (path == null || sm == null) { + return false; + } + return "mounted".equals(sm.getVolumeState(path)); + } +} diff --git a/oplus-fwk/src/com/oplus/osense/OsenseResEventClient.java b/oplus-fwk/src/com/oplus/osense/OsenseResEventClient.java index 27da765..dbcd8fb 100644 --- a/oplus-fwk/src/com/oplus/osense/OsenseResEventClient.java +++ b/oplus-fwk/src/com/oplus/osense/OsenseResEventClient.java @@ -2,18 +2,11 @@ package com.oplus.osense; public class OsenseResEventClient { - private static volatile OsenseResEventClient sInstance; - - private OsenseResEventClient() { - } + private static OsenseResEventClient sInstance; public static OsenseResEventClient getInstance() { if (sInstance == null) { - synchronized (OsenseResEventClient.class) { - if (sInstance == null) { - sInstance = new OsenseResEventClient(); - } - } + sInstance = new OsenseResEventClient(); } return sInstance; } diff --git a/oplus-fwk/src/com/oplus/osense/eventinfo/IOsenseEventCallback.java b/oplus-fwk/src/com/oplus/osense/eventinfo/IOsenseEventCallback.java index 80692ed..fd40641 100644 --- a/oplus-fwk/src/com/oplus/osense/eventinfo/IOsenseEventCallback.java +++ b/oplus-fwk/src/com/oplus/osense/eventinfo/IOsenseEventCallback.java @@ -3,21 +3,18 @@ package com.oplus.osense.eventinfo; import android.os.Binder; import android.os.IBinder; import android.os.IInterface; -import android.os.Parcel; -import android.os.RemoteException; -/* loaded from: classes.dex */ public interface IOsenseEventCallback extends IInterface { public static class Default implements IOsenseEventCallback { - @Override // android.os.IInterface + @Override public IBinder asBinder() { return null; } } public static abstract class Stub extends Binder implements IOsenseEventCallback { - @Override // android.os.IInterface + @Override public IBinder asBinder() { return this; } diff --git a/oplus-fwk/src/com/oplus/osense/eventinfo/OsenseEventCallback.java b/oplus-fwk/src/com/oplus/osense/eventinfo/OsenseEventCallback.java index 5201a1e..50e2072 100644 --- a/oplus-fwk/src/com/oplus/osense/eventinfo/OsenseEventCallback.java +++ b/oplus-fwk/src/com/oplus/osense/eventinfo/OsenseEventCallback.java @@ -3,5 +3,4 @@ package com.oplus.osense.eventinfo; import com.oplus.osense.eventinfo.IOsenseEventCallback; public class OsenseEventCallback extends IOsenseEventCallback.Stub { - } diff --git a/oplus-fwk/src/com/oplus/screenshot/OplusLongshotCustomController.java b/oplus-fwk/src/com/oplus/screenshot/OplusLongshotCustomController.java index 0bb6f84..c42eb2e 100644 --- a/oplus-fwk/src/com/oplus/screenshot/OplusLongshotCustomController.java +++ b/oplus-fwk/src/com/oplus/screenshot/OplusLongshotCustomController.java @@ -1,6 +1,6 @@ -package com.oplus.screenshot; - -public class OplusLongshotCustomController { - - public OplusLongshotCustomController(OplusLongshotViewBase view, String source) {} -} +package com.oplus.screenshot; + +public class OplusLongshotCustomController { + + public OplusLongshotCustomController(OplusLongshotViewBase view, String source) {} +} diff --git a/oplus-fwk/src/com/oplus/screenshot/OplusLongshotViewBase.java b/oplus-fwk/src/com/oplus/screenshot/OplusLongshotViewBase.java index 4b30002..24c276c 100644 --- a/oplus-fwk/src/com/oplus/screenshot/OplusLongshotViewBase.java +++ b/oplus-fwk/src/com/oplus/screenshot/OplusLongshotViewBase.java @@ -1,20 +1,20 @@ -package com.oplus.screenshot; - -import android.content.Context; - -public interface OplusLongshotViewBase { - - boolean canLongScroll(); - - int computeLongScrollExtent(); - - int computeLongScrollOffset(); - - int computeLongScrollRange(); - - boolean findViewsLongshotInfo(OplusLongshowViewInfo oplusLongshowViewInfo); - - Context getContext(); - - boolean isLongshotVisibleToUser(); -} +package com.oplus.screenshot; + +import android.content.Context; + +public interface OplusLongshotViewBase { + + boolean canLongScroll(); + + int computeLongScrollExtent(); + + int computeLongScrollOffset(); + + int computeLongScrollRange(); + + boolean findViewsLongshotInfo(OplusLongshowViewInfo oplusLongshowViewInfo); + + Context getContext(); + + boolean isLongshotVisibleToUser(); +} diff --git a/oplus-fwk/src/com/oplus/screenshot/OplusLongshowViewInfo.java b/oplus-fwk/src/com/oplus/screenshot/OplusLongshowViewInfo.java index ca45f7f..4c83c66 100644 --- a/oplus-fwk/src/com/oplus/screenshot/OplusLongshowViewInfo.java +++ b/oplus-fwk/src/com/oplus/screenshot/OplusLongshowViewInfo.java @@ -1,6 +1,6 @@ -package com.oplus.screenshot; - -public class OplusLongshowViewInfo { - - public OplusLongshowViewInfo() {} -} +package com.oplus.screenshot; + +public class OplusLongshowViewInfo { + + public OplusLongshowViewInfo() {} +} diff --git a/oplus-fwk/src/com/oplus/uifirst/OplusUIFirstManager.java b/oplus-fwk/src/com/oplus/uifirst/OplusUIFirstManager.java index 71823b7..7aaf0ff 100644 --- a/oplus-fwk/src/com/oplus/uifirst/OplusUIFirstManager.java +++ b/oplus-fwk/src/com/oplus/uifirst/OplusUIFirstManager.java @@ -11,6 +11,5 @@ public class OplusUIFirstManager { return sOplusUIFirstManager; } - public void setUxThreadValue(int pid, int tid, String value) { - } + public void setUxThreadValue(int pid, int tid, String value) {} } diff --git a/oplus-fwk/src/com/oplus/util/OplusChangeTextUtil.java b/oplus-fwk/src/com/oplus/util/OplusChangeTextUtil.java index 0092bff..fe8872a 100644 --- a/oplus-fwk/src/com/oplus/util/OplusChangeTextUtil.java +++ b/oplus-fwk/src/com/oplus/util/OplusChangeTextUtil.java @@ -1,52 +1,52 @@ -package com.oplus.util; - -public class OplusChangeTextUtil { - - private static final String TAG = "OplusChangeTextUtil"; - - private static final float H1 = 0.9f; - private static final float H2 = 1.0f; - private static final float H3 = 1.1f; - private static final float H4 = 1.25f; - private static final float H5 = 1.45f; - private static final float H6 = 1.65f; - - public static final int G1 = 1; - public static final int G2 = 2; - public static final int G3 = 3; - public static final int G4 = 4; - public static final int G5 = 5; - public static final int G6 = 6; - - public static final float[] SCALE_LEVEL = {H1, H2, H3, H4, H5, H6}; - - public static float getSuitableFontSize(float textSize, float scale, int level) { - if (level < 2) { - return textSize; - } - if (level > SCALE_LEVEL.length) { - level = SCALE_LEVEL.length; - } - final float textSizeNoScale = textSize / scale; - switch (level) { - case G2: - if (scale < H3) { - return H2 * textSizeNoScale; - } - return H3 * textSizeNoScale; - case G3: - if (scale < H3) { - return H2 * textSizeNoScale; - } - if (scale < H5) { - return H3 * textSizeNoScale; - } - return H4 * textSizeNoScale; - default: - if (scale > SCALE_LEVEL[level - 1]) { - return SCALE_LEVEL[level - 1] * textSizeNoScale; - } - return textSizeNoScale * scale; - } - } -} +package com.oplus.util; + +public class OplusChangeTextUtil { + + private static final String TAG = "OplusChangeTextUtil"; + + private static final float H1 = 0.9f; + private static final float H2 = 1.0f; + private static final float H3 = 1.1f; + private static final float H4 = 1.25f; + private static final float H5 = 1.45f; + private static final float H6 = 1.65f; + + public static final int G1 = 1; + public static final int G2 = 2; + public static final int G3 = 3; + public static final int G4 = 4; + public static final int G5 = 5; + public static final int G6 = 6; + + public static final float[] SCALE_LEVEL = {H1, H2, H3, H4, H5, H6}; + + public static float getSuitableFontSize(float textSize, float scale, int level) { + if (level < 2) { + return textSize; + } + if (level > SCALE_LEVEL.length) { + level = SCALE_LEVEL.length; + } + final float textSizeNoScale = textSize / scale; + switch (level) { + case G2: + if (scale < H3) { + return H2 * textSizeNoScale; + } + return H3 * textSizeNoScale; + case G3: + if (scale < H3) { + return H2 * textSizeNoScale; + } + if (scale < H5) { + return H3 * textSizeNoScale; + } + return H4 * textSizeNoScale; + default: + if (scale > SCALE_LEVEL[level - 1]) { + return SCALE_LEVEL[level - 1] * textSizeNoScale; + } + return textSizeNoScale * scale; + } + } +} diff --git a/oplus-fwk/src/com/oplus/util/OplusNetworkUtils.java b/oplus-fwk/src/com/oplus/util/OplusNetworkUtil.java similarity index 74% rename from oplus-fwk/src/com/oplus/util/OplusNetworkUtils.java rename to oplus-fwk/src/com/oplus/util/OplusNetworkUtil.java index fa8c64e..cd2ef59 100644 --- a/oplus-fwk/src/com/oplus/util/OplusNetworkUtils.java +++ b/oplus-fwk/src/com/oplus/util/OplusNetworkUtil.java @@ -6,35 +6,35 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; -public class OplusNetworkUtils { +public class OplusNetworkUtil { private static final String DEFAULT_HTTP_URI = "http://connectivitycheck.gstatic.com/generate_204"; public static boolean isWifiConnected(Context context) { - ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class); if (cm != null) { return cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED; } return false; } - + public static boolean isMobileDataConnected(Context context) { - ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class); if (cm != null) { return cm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED; } return false; } - + public static void onClickLoginBtn(Context context) { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(DEFAULT_HTTP_URI)); + final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(DEFAULT_HTTP_URI)); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); context.startActivity(intent); } - + public static int getErrorString(Context context, String url) { - return 1; + return 1; } } diff --git a/oplus-fwk/src/com/oplus/wrapper/os/ServiceManager.java b/oplus-fwk/src/com/oplus/wrapper/os/ServiceManager.java index cc52029..be895b0 100644 --- a/oplus-fwk/src/com/oplus/wrapper/os/ServiceManager.java +++ b/oplus-fwk/src/com/oplus/wrapper/os/ServiceManager.java @@ -3,15 +3,16 @@ package com.oplus.wrapper.os; import android.os.IBinder; public class ServiceManager { - public static void addService(String paramString, IBinder paramIBinder) { - android.os.ServiceManager.addService(paramString, paramIBinder); - } - - public static IBinder checkService(String paramString) { - return android.os.ServiceManager.checkService(paramString); - } - - public static IBinder getService(String paramString) { - return android.os.ServiceManager.getService(paramString); - } + + public static IBinder checkService(String name) { + return android.os.ServiceManager.checkService(name); + } + + public static IBinder getService(String name) { + return android.os.ServiceManager.getService(name); + } + + public static void addService(String name, IBinder token) { + android.os.ServiceManager.addService(name, token); + } } diff --git a/oplus-fwk/src/com/oplus/wrapper/view/IWindowManager.java b/oplus-fwk/src/com/oplus/wrapper/view/IWindowManager.java index 9171772..9cbaa55 100644 --- a/oplus-fwk/src/com/oplus/wrapper/view/IWindowManager.java +++ b/oplus-fwk/src/com/oplus/wrapper/view/IWindowManager.java @@ -1,160 +1,86 @@ package com.oplus.wrapper.view; -import android.app.IAssistDataReceiver; -import android.content.ComponentName; -import android.content.res.Configuration; -import android.graphics.Bitmap; import android.graphics.Point; -import android.graphics.Rect; -import android.graphics.Region; -import android.os.Bundle; import android.os.IBinder; import android.os.IInterface; -import android.os.IRemoteCallback; import android.os.RemoteException; -import android.view.IAppTransitionAnimationSpecsFuture; -import android.view.ICrossWindowBlurEnabledListener; -import android.view.IDisplayChangeWindowController; -import android.view.IDisplayFoldListener; -import android.view.IDisplayWindowInsetsController; -import android.view.IDisplayWindowListener; -import android.view.IOnKeyguardExitResult; -import android.view.IPinnedTaskListener; import android.view.IRotationWatcher; -import android.view.IScrollCaptureResponseListener; -import android.view.ISystemGestureExclusionListener; -import android.view.IWallpaperVisibilityListener; -import android.view.IWindow; -import android.view.IWindowSession; -import android.view.IWindowSessionCallback; -import android.view.InputChannel; -import android.view.InsetsState; -import android.view.TaskTransitionSpec; -import android.view.WindowContentFrameStats; -import android.view.displayhash.DisplayHash; -import android.view.displayhash.VerifiedDisplayHash; -import android.window.AddToSurfaceSyncGroupResult; -import android.window.ISurfaceSyncGroupCompletedListener; -import android.window.ITaskFpsCallback; -import android.window.ScreenCapture; -import com.android.internal.os.IResultReceiver; -import com.android.internal.policy.IKeyguardDismissCallback; -import com.android.internal.policy.IKeyguardLockedStateListener; -import com.android.internal.policy.IShortcutService; -import com.oplus.wrapper.view.IWindowManager; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; -/* loaded from: classes.dex */ public interface IWindowManager { - int getBaseDisplayDensity(int i) throws RemoteException; - - void getBaseDisplaySize(int i, Point point) throws RemoteException; int getDockedStackSide() throws RemoteException; + int getInitialDisplayDensity(int displayId) throws RemoteException; + boolean hasNavigationBar(int displayId) throws RemoteException; + int watchRotation(IRotationWatcher watcher, int displayId) throws RemoteException; + void removeRotationWatcher(IRotationWatcher watcher) throws RemoteException; + void setForcedDisplayDensityForUser(int displayId, int density, int userId) throws RemoteException; + int getBaseDisplayDensity(int displayId) throws RemoteException; + void getBaseDisplaySize(int displayId, Point size) throws RemoteException; - int getInitialDisplayDensity(int i) throws RemoteException; + public static abstract class Stub implements IInterface, android.view.IWindowManager { - boolean hasNavigationBar(int i) throws RemoteException; - - void removeRotationWatcher(IRotationWatcher iRotationWatcher) throws RemoteException; - - void setForcedDisplayDensityForUser(int i, int i2, int i3) throws RemoteException; - - int watchRotation(IRotationWatcher iRotationWatcher, int i) throws RemoteException; - - /* loaded from: classes.dex */ - public static abstract class Stub implements android.os.IInterface, android.view.IWindowManager { private final android.view.IWindowManager mIWindowManager; public Stub(android.view.IWindowManager windowManager) { - this.mIWindowManager = windowManager; + mIWindowManager = windowManager; } public static IWindowManager asInterface(IBinder obj) { return new Proxy(android.view.IWindowManager.Stub.asInterface(obj)); } - @Override // android.os.IInterface + @Override public IBinder asBinder() { - return this.mIWindowManager.asBinder(); + return mIWindowManager.asBinder(); } - /* JADX INFO: Access modifiers changed from: private */ - /* loaded from: classes.dex */ public static class Proxy implements IWindowManager { - private static Map sRotationWatcherMap = new ConcurrentHashMap(); + private final android.view.IWindowManager mIWindowManager; - Proxy(android.view.IWindowManager iWindowManager) { - this.mIWindowManager = iWindowManager; + Proxy(android.view.IWindowManager windowManager) { + mIWindowManager = windowManager; } - @Override // com.oplus.wrapper.view.IWindowManager + @Override public int getDockedStackSide() throws RemoteException { - return this.mIWindowManager.getDockedStackSide(); + return mIWindowManager.getDockedStackSide(); } - @Override // com.oplus.wrapper.view.IWindowManager + @Override public int getInitialDisplayDensity(int displayId) throws RemoteException { - return this.mIWindowManager.getInitialDisplayDensity(displayId); + return mIWindowManager.getInitialDisplayDensity(displayId); } - @Override // com.oplus.wrapper.view.IWindowManager + @Override public boolean hasNavigationBar(int displayId) throws RemoteException { - return this.mIWindowManager.hasNavigationBar(displayId); + return mIWindowManager.hasNavigationBar(displayId); } - @Override // com.oplus.wrapper.view.IWindowManager + @Override public int watchRotation(IRotationWatcher watcher, int displayId) throws RemoteException { - android.view.IRotationWatcher rotationWatcher = sRotationWatcherMap.computeIfAbsent(watcher, new Function() { // from class: com.oplus.wrapper.view.IWindowManager$Stub$Proxy$$ExternalSyntheticLambda0 - @Override // java.util.function.Function - public final Object apply(Object obj) { - android.view.IRotationWatcher lambda$watchRotation$0; - lambda$watchRotation$0 = IWindowManager.Stub.Proxy.this.lambda$watchRotation$0((IRotationWatcher) obj); - return lambda$watchRotation$0; - } - }); - return this.mIWindowManager.watchRotation(rotationWatcher, displayId); + return mIWindowManager.watchRotation(watcher, displayId); } - /* JADX INFO: Access modifiers changed from: private */ - public /* synthetic */ android.view.IRotationWatcher lambda$watchRotation$0(final IRotationWatcher observer) { - return new IRotationWatcher.Stub() { // from class: com.oplus.wrapper.view.IWindowManager.Stub.Proxy.1 - public void onRotationChanged(int rotation) throws RemoteException { - observer.onRotationChanged(rotation); - } - }; - } - - @Override // com.oplus.wrapper.view.IWindowManager + @Override public void removeRotationWatcher(IRotationWatcher watcher) throws RemoteException { - android.view.IRotationWatcher rotationWatcher = sRotationWatcherMap.get(watcher); - if (rotationWatcher == null) { - return; - } - sRotationWatcherMap.remove(watcher); - this.mIWindowManager.removeRotationWatcher(rotationWatcher); + mIWindowManager.removeRotationWatcher(watcher); } - @Override // com.oplus.wrapper.view.IWindowManager + @Override public void setForcedDisplayDensityForUser(int displayId, int density, int userId) throws RemoteException { - this.mIWindowManager.setForcedDisplayDensityForUser(displayId, density, userId); + mIWindowManager.setForcedDisplayDensityForUser(displayId, density, userId); } - @Override // com.oplus.wrapper.view.IWindowManager + @Override public int getBaseDisplayDensity(int displayId) throws RemoteException { - return this.mIWindowManager.getBaseDisplayDensity(displayId); + return mIWindowManager.getBaseDisplayDensity(displayId); } - @Override // com.oplus.wrapper.view.IWindowManager + @Override public void getBaseDisplaySize(int displayId, Point size) throws RemoteException { - this.mIWindowManager.getBaseDisplaySize(displayId, size); + mIWindowManager.getBaseDisplaySize(displayId, size); } } } } - diff --git a/oplus-fwk/src/com/oplus/zoomwindow/IOplusZoomWindowObserver.aidl b/oplus-fwk/src/com/oplus/zoomwindow/IOplusZoomWindowObserver.aidl index b4c5b5f..57c3dcc 100644 --- a/oplus-fwk/src/com/oplus/zoomwindow/IOplusZoomWindowObserver.aidl +++ b/oplus-fwk/src/com/oplus/zoomwindow/IOplusZoomWindowObserver.aidl @@ -1,11 +1,11 @@ -package com.oplus.zoomwindow; - -import com.oplus.zoomwindow.OplusZoomWindowInfo; - -interface IOplusZoomWindowObserver { - - void onInputMethodChanged(boolean z); - void onZoomWindowDied(String str); - void onZoomWindowHide(inout OplusZoomWindowInfo oplusZoomWindowInfo); - void onZoomWindowShow(inout OplusZoomWindowInfo oplusZoomWindowInfo); -} +package com.oplus.zoomwindow; + +import com.oplus.zoomwindow.OplusZoomWindowInfo; + +interface IOplusZoomWindowObserver { + + void onInputMethodChanged(boolean isShown); + void onZoomWindowDied(String appName); + void onZoomWindowHide(inout OplusZoomWindowInfo info); + void onZoomWindowShow(inout OplusZoomWindowInfo info); +} diff --git a/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.aidl b/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.aidl index b715f8c..077f18d 100644 --- a/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.aidl +++ b/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.aidl @@ -1,3 +1,3 @@ -package com.oplus.zoomwindow; - -parcelable OplusZoomWindowInfo; +package com.oplus.zoomwindow; + +parcelable OplusZoomWindowInfo; diff --git a/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.java b/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.java index e0a4276..682a8b6 100644 --- a/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.java +++ b/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowInfo.java @@ -1,37 +1,37 @@ -package com.oplus.zoomwindow; - -import android.os.Parcel; -import android.os.Parcelable; - -public class OplusZoomWindowInfo implements Parcelable { - - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - - @Override - public OplusZoomWindowInfo createFromParcel(Parcel source) { - return new OplusZoomWindowInfo(source); - } - - @Override - public OplusZoomWindowInfo[] newArray(int size) { - return new OplusZoomWindowInfo[size]; - } - }; - - public OplusZoomWindowInfo() {} - - public OplusZoomWindowInfo(Parcel in) {} - - public OplusZoomWindowInfo(OplusZoomWindowInfo in) {} - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) {} - - public void readFromParcel(Parcel in) {} -} +package com.oplus.zoomwindow; + +import android.os.Parcel; +import android.os.Parcelable; + +public class OplusZoomWindowInfo implements Parcelable { + + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { + + @Override + public OplusZoomWindowInfo createFromParcel(Parcel source) { + return new OplusZoomWindowInfo(source); + } + + @Override + public OplusZoomWindowInfo[] newArray(int size) { + return new OplusZoomWindowInfo[size]; + } + }; + + public OplusZoomWindowInfo() {} + + public OplusZoomWindowInfo(Parcel in) {} + + public OplusZoomWindowInfo(OplusZoomWindowInfo in) {} + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) {} + + public void readFromParcel(Parcel in) {} +} diff --git a/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowManager.java b/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowManager.java index 10dba51..6075256 100644 --- a/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowManager.java +++ b/oplus-fwk/src/com/oplus/zoomwindow/OplusZoomWindowManager.java @@ -1,21 +1,21 @@ -package com.oplus.zoomwindow; - -public class OplusZoomWindowManager { - - public static OplusZoomWindowManager sOplusZoomWindowManager = null; - - public static OplusZoomWindowManager getInstance() { - if (sOplusZoomWindowManager == null) { - sOplusZoomWindowManager = new OplusZoomWindowManager(); - } - return sOplusZoomWindowManager; - } - - public boolean registerZoomWindowObserver(IOplusZoomWindowObserver observer) { - return false; - } - - public boolean unregisterZoomWindowObserver(IOplusZoomWindowObserver observer) { - return false; - } -} +package com.oplus.zoomwindow; + +public class OplusZoomWindowManager { + + public static OplusZoomWindowManager sOplusZoomWindowManager = null; + + public static OplusZoomWindowManager getInstance() { + if (sOplusZoomWindowManager == null) { + sOplusZoomWindowManager = new OplusZoomWindowManager(); + } + return sOplusZoomWindowManager; + } + + public boolean registerZoomWindowObserver(IOplusZoomWindowObserver observer) { + return false; + } + + public boolean unregisterZoomWindowObserver(IOplusZoomWindowObserver observer) { + return false; + } +} diff --git a/oplus-fwk/src/net/oneplus/odm/OpDeviceManagerInjector.java b/oplus-fwk/src/net/oneplus/odm/OpDeviceManagerInjector.java index 2eda0e0..b03a3a2 100644 --- a/oplus-fwk/src/net/oneplus/odm/OpDeviceManagerInjector.java +++ b/oplus-fwk/src/net/oneplus/odm/OpDeviceManagerInjector.java @@ -1,19 +1,19 @@ -package net.oneplus.odm; - -import android.content.Context; - -import java.util.Map; - -public class OpDeviceManagerInjector { - - private static OpDeviceManagerInjector sOpDeviceManagerInjector = null; - - public void preserveAppData(Context a, String b, Map c, Map d) {} - - public static OpDeviceManagerInjector getInstance() { - if (sOpDeviceManagerInjector == null) { - sOpDeviceManagerInjector = new OpDeviceManagerInjector(); - } - return sOpDeviceManagerInjector; - } -} +package net.oneplus.odm; + +import android.content.Context; + +import java.util.Map; + +public class OpDeviceManagerInjector { + + private static OpDeviceManagerInjector sOpDeviceManagerInjector = null; + + public void preserveAppData(Context a, String b, Map c, Map d) {} + + public static OpDeviceManagerInjector getInstance() { + if (sOpDeviceManagerInjector == null) { + sOpDeviceManagerInjector = new OpDeviceManagerInjector(); + } + return sOpDeviceManagerInjector; + } +}