Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "CameraServiceProxy: Clean up app compat overrides"" into sc-v2-dev

Browse Source
This commit is contained in:
Fred Chiou
2021-11-05 07:28:14 +00:00
committed by Android (Google) Code Review
parent e6a32faf86 b66ebbe529
commit 1b639213de
1 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
services/core/java/com/android/server/camera/CameraServiceProxy.java
View File

@@ -108,9 +108,8 @@ public class CameraServiceProxy extends SystemService
/** /**
* When enabled this change id forces the packages it is applied to override the default * When enabled this change id forces the packages it is applied to override the default
* camera rotate & crop behavior and always return CaptureRequest.SCALER_ROTATE_AND_CROP_NONE . * camera rotate & crop behavior. The default behavior along with all possible override
* The default behavior along with all possible override combinations is discussed in the table * combinations is discussed in the table below.
* below.
*/ */
@ChangeId @ChangeId
@Overridable @Overridable
@@ -122,7 +121,9 @@ public class CameraServiceProxy extends SystemService
* When enabled this change id forces the packages it is applied to ignore the current value of * When enabled this change id forces the packages it is applied to ignore the current value of
* 'android:resizeableActivity' as well as target SDK equal to or below M and consider the * 'android:resizeableActivity' as well as target SDK equal to or below M and consider the
* activity as non-resizeable. In this case, the value of camera rotate & crop will only depend * activity as non-resizeable. In this case, the value of camera rotate & crop will only depend
* on the needed compensation considering the current display rotation. * on potential mismatches between the orientation of the camera and the fixed orientation of
* the activity. You can check the table below for further details on the possible override
* combinations.
*/ */
@ChangeId @ChangeId
@Overridable @Overridable
@@ -130,31 +131,68 @@ public class CameraServiceProxy extends SystemService
@TestApi @TestApi
public static final long OVERRIDE_CAMERA_RESIZABLE_AND_SDK_CHECK = 191513214L; // buganizer id public static final long OVERRIDE_CAMERA_RESIZABLE_AND_SDK_CHECK = 191513214L; // buganizer id
/**
* This change id forces the packages it is applied to override the default camera rotate & crop
* behavior. Enabling it will set the crop & rotate parameter to
* {@link android.hardware.camera2.CaptureRequest#SCALER_ROTATE_AND_CROP_90} and disabling it
* will reset the parameter to
* {@link android.hardware.camera2.CaptureRequest#SCALER_ROTATE_AND_CROP_NONE} as long as camera
* clients include {@link android.hardware.camera2.CaptureRequest#SCALER_ROTATE_AND_CROP_AUTO}
* in their capture requests.
*
* This treatment only takes effect if OVERRIDE_CAMERA_ROTATE_AND_CROP_DEFAULTS is also enabled.
* The table below includes further information about the possible override combinations.
*/
@ChangeId
@Overridable
@Disabled
@TestApi
public static final long OVERRIDE_CAMERA_ROTATE_AND_CROP = 190069291L; //buganizer id
/** /**
* Possible override combinations * Possible override combinations
* *
* |OVERRIDE |OVERRIDE_ * |OVERRIDE | |OVERRIDE_
* |CAMERA_ |CAMERA_ * |CAMERA_ |OVERRIDE |CAMERA_
* |ROTATE_ |RESIZEABLE_ * |ROTATE_ |CAMERA_ |RESIZEABLE_
* |AND_CROP_ |AND_SDK_ * |AND_CROP_ |ROTATE_ |AND_SDK_
* |DEFAULTS |CHECK * |DEFAULTS |AND_CROP |CHECK
* _________________________________________________ * ______________________________________________
* Default Behavior | D |D * Default | | |
* _________________________________________________ * Behavior | D |D |D
* Ignore SDK&Resize | D |E * ______________________________________________
* _________________________________________________ * Ignore | | |
* SCALER_ROTATE_AND_CROP_NONE | E |D, E * SDK&Resize | D |D |E
* _________________________________________________ * ______________________________________________
* Default | | |
* Behavior | D |E |D
* ______________________________________________
* Ignore | | |
* SDK&Resize | D |E |E
* ______________________________________________
* Rotate&Crop| | |
* disabled | E |D |D
* ______________________________________________
* Rotate&Crop| | |
* disabled | E |D |E
* ______________________________________________
* Rotate&Crop| | |
* enabled | E |E |D
* ______________________________________________
* Rotate&Crop| | |
* enabled | E |E |E
* ______________________________________________
* Where: * Where:
* E -> Override enabled * E -> Override enabled
* D -> Override disabled * D -> Override disabled
* Default behavior -> Rotate&crop will be calculated depending on the required * Default behavior -> Rotate&crop will be enabled only in cases
* compensation necessary for the current display rotation. * where the fixed app orientation mismatches
* Additionally the app must either target M (or below) * with the orientation of the camera.
* or is declared as non-resizeable. * Additionally the app must either target M (or below)
* Ignore SDK&Resize -> The Rotate&crop value will depend on the required * or is declared as non-resizeable.
* compensation for the current display rotation. * Ignore SDK&Resize -> Rotate&crop will be enabled only in cases
* SCALER_ROTATE_AND_CROP_NONE -> Always return CaptureRequest.SCALER_ROTATE_AND_CROP_NONE * where the fixed app orientation mismatches
* with the orientation of the camera.
*/ */
// Flags arguments to NFC adapter to enable/disable NFC // Flags arguments to NFC adapter to enable/disable NFC
@@ -505,8 +543,14 @@ public class CameraServiceProxy extends SystemService
if ((taskInfo != null) && (CompatChanges.isChangeEnabled( if ((taskInfo != null) && (CompatChanges.isChangeEnabled(
OVERRIDE_CAMERA_ROTATE_AND_CROP_DEFAULTS, packageName, OVERRIDE_CAMERA_ROTATE_AND_CROP_DEFAULTS, packageName,
UserHandle.getUserHandleForUid(taskInfo.userId)))) { UserHandle.getUserHandleForUid(taskInfo.userId)))) {
Slog.v(TAG, "OVERRIDE_CAMERA_ROTATE_AND_CROP_DEFAULTS enabled!"); if (CompatChanges.isChangeEnabled(OVERRIDE_CAMERA_ROTATE_AND_CROP, packageName,
UserHandle.getUserHandleForUid(taskInfo.userId))) {
Slog.v(TAG, "OVERRIDE_CAMERA_ROTATE_AND_CROP enabled!");
return CaptureRequest.SCALER_ROTATE_AND_CROP_NONE; return CaptureRequest.SCALER_ROTATE_AND_CROP_NONE;
} else {
Slog.v(TAG, "OVERRIDE_CAMERA_ROTATE_AND_CROP disabled!");
return CaptureRequest.SCALER_ROTATE_AND_CROP_NONE;
}
} }
boolean ignoreResizableAndSdkCheck = false; boolean ignoreResizableAndSdkCheck = false;
if ((taskInfo != null) && (CompatChanges.isChangeEnabled( if ((taskInfo != null) && (CompatChanges.isChangeEnabled(