PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Use 1030 opcode, deprecate 1024."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-25 08:00:01 +00:00
committed by Android (Google) Code Review
parent 34537c1c38 0a16997fe9
commit 61a8d1fbe4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/display/ColorModePreferenceController.java
View File

@@ -29,7 +29,7 @@ import com.android.settings.core.BasePreferenceController;
public class ColorModePreferenceController extends BasePreferenceController { public class ColorModePreferenceController extends BasePreferenceController {
private static final String TAG = "ColorModePreference"; private static final String TAG = "ColorModePreference";
private static final int SURFACE_FLINGER_TRANSACTION_QUERY_WIDE_COLOR = 1024; private static final int SURFACE_FLINGER_TRANSACTION_QUERY_COLOR_MANAGEMENT = 1030;
private final ConfigurationWrapper mConfigWrapper; private final ConfigurationWrapper mConfigWrapper;
private ColorDisplayController mColorDisplayController; private ColorDisplayController mColorDisplayController;
@@ -41,7 +41,7 @@ public class ColorModePreferenceController extends BasePreferenceController {
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return mConfigWrapper.isScreenWideColorGamut() return mConfigWrapper.isDeviceColorManaged()
&& !getColorDisplayController().getAccessibilityTransformActivated() ? && !getColorDisplayController().getAccessibilityTransformActivated() ?
AVAILABLE_UNSEARCHABLE : DISABLED_FOR_USER; AVAILABLE_UNSEARCHABLE : DISABLED_FOR_USER;
} }
@@ -77,17 +77,17 @@ public class ColorModePreferenceController extends BasePreferenceController {
mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger"); mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
} }
boolean isScreenWideColorGamut() { boolean isDeviceColorManaged() {
if (mSurfaceFlinger != null) { if (mSurfaceFlinger != null) {
final Parcel data = Parcel.obtain(); final Parcel data = Parcel.obtain();
final Parcel reply = Parcel.obtain(); final Parcel reply = Parcel.obtain();
data.writeInterfaceToken("android.ui.ISurfaceComposer"); data.writeInterfaceToken("android.ui.ISurfaceComposer");
try { try {
mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_QUERY_WIDE_COLOR, mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_QUERY_COLOR_MANAGEMENT,
data, reply, 0); data, reply, 0);
return reply.readBoolean(); return reply.readBoolean();
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Failed to query wide color support", ex); Log.e(TAG, "Failed to query color management support", ex);
} finally { } finally {
data.recycle(); data.recycle();
reply.recycle(); reply.recycle();