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

Commit 89052d92 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Schematize Display system properties 

Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I4b49ed7e9b93c20855928ca61f9f128a0aa1d6d1
Merged-In: Id9bbb997669b05b6edb5307d561e766ead19abf1
parent db4ce870

core/java/android/text/TextUtils.java

+2 −3
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ import android.icu.text.Edits; 
import android.icu.util.ULocale;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.SystemProperties;

import android.provider.Settings;

import android.sysprop.DisplayProperties;

import android.text.style.AbsoluteSizeSpan;

import android.text.style.AccessibilityClickableSpan;

import android.text.style.AccessibilityURLSpan;
@@ -2001,7 +2000,7 @@ public class TextUtils { 
        return ((locale != null && !locale.equals(Locale.ROOT)

                        && ULocale.forLocale(locale).isRightToLeft())

                // If forcing into RTL layout mode, return RTL as default

                || SystemProperties.getBoolean(Settings.Global.DEVELOPMENT_FORCE_RTL, false))

                || DisplayProperties.debug_force_rtl().orElse(false))

            ? View.LAYOUT_DIRECTION_RTL

            : View.LAYOUT_DIRECTION_LTR;

    }

core/java/android/view/View.java

+2 −10
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.sysprop.DisplayProperties;

import android.text.InputType;

import android.text.TextUtils;

import android.util.AttributeSet;
@@ -789,14 +789,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     */

    protected static final String VIEW_LOG_TAG = "View";













    /**













     * When set to true, apps will draw debugging information about their layouts.













     *













     * @hide













     */













    @UnsupportedAppUsage













    public static final String DEBUG_LAYOUT_PROPERTY = "debug.layout";



























    /**















     * When set to true, this view will save its attribute data.















     *










@@ -26855,7 +26847,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        /**















         * Show where the margins, bounds and layout bounds are for each view.















         */













        boolean mDebugLayout = SystemProperties.getBoolean(DEBUG_LAYOUT_PROPERTY, false);













        boolean mDebugLayout = DisplayProperties.debug_layout().orElse(false);





























        /**















         * Point used to compute visible regions.

























core/java/android/view/ViewRootImpl.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -70,6 +70,7 @@ import android.os.RemoteException;













import android.os.SystemClock;















import android.os.SystemProperties;















import android.os.Trace;













import android.sysprop.DisplayProperties;















import android.util.AndroidRuntimeException;















import android.util.DisplayMetrics;















import android.util.Log;










@@ -6829,7 +6830,7 @@ public final class ViewRootImpl implements ViewParent,













                }































                // Layout debugging













                boolean layout = SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false);













                boolean layout = DisplayProperties.debug_layout().orElse(false);















                if (layout != mAttachInfo.mDebugLayout) {















                    mAttachInfo.mDebugLayout = layout;















                    if (!mHandler.hasMessages(MSG_INVALIDATE_WORLD)) {

































services/core/java/com/android/server/am/ActivityManagerService.java



+18
−18




























Original line number
Diff line number
Diff line








@@ -89,7 +89,6 @@ import static android.os.Process.SCHED_OTHER;













import static android.os.Process.SCHED_RESET_ON_FORK;















import static android.os.Process.SE_UID;















import static android.os.Process.SHELL_UID;













import static android.os.Process.SIGNAL_QUIT;















import static android.os.Process.SIGNAL_USR1;















import static android.os.Process.SYSTEM_UID;















import static android.os.Process.THREAD_GROUP_BG_NONINTERACTIVE;










@@ -127,6 +126,12 @@ import static android.service.voice.VoiceInteractionSession.SHOW_SOURCE_APPLICAT













import static android.text.format.DateUtils.DAY_IN_MILLIS;















import static android.view.Display.DEFAULT_DISPLAY;















import static android.view.Display.INVALID_DISPLAY;













import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;













import static android.view.WindowManager.TRANSIT_NONE;













import static android.view.WindowManager.TRANSIT_TASK_IN_PLACE;













import static android.view.WindowManager.TRANSIT_TASK_OPEN;













import static android.view.WindowManager.TRANSIT_TASK_TO_FRONT;



























import static com.android.internal.util.XmlUtils.readBooleanAttribute;















import static com.android.internal.util.XmlUtils.readIntAttribute;















import static com.android.internal.util.XmlUtils.readLongAttribute;










@@ -197,19 +202,15 @@ import static com.android.server.am.ActivityStackSupervisor.MATCH_TASK_IN_STACKS













import static com.android.server.am.ActivityStackSupervisor.ON_TOP;















import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;















import static com.android.server.am.ActivityStackSupervisor.REMOVE_FROM_RECENTS;













import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;















import static com.android.server.am.MemoryStatUtil.hasMemcg;













import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;















import static com.android.server.am.TaskRecord.INVALID_TASK_ID;















import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_DONT_LOCK;















import static com.android.server.am.TaskRecord.REPARENT_KEEP_STACK_AT_FRONT;















import static com.android.server.am.TaskRecord.REPARENT_LEAVE_STACK_IN_PLACE;













import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;













import static android.view.WindowManager.TRANSIT_NONE;













import static android.view.WindowManager.TRANSIT_TASK_IN_PLACE;













import static android.view.WindowManager.TRANSIT_TASK_OPEN;













import static android.view.WindowManager.TRANSIT_TASK_TO_FRONT;













import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION;















import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE;













import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION;



























import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;















import static org.xmlpull.v1.XmlPullParser.START_TAG;
























@@ -326,7 +327,6 @@ import android.os.Debug;













import android.os.DropBoxManager;















import android.os.Environment;















import android.os.FactoryTest;













import android.os.FileObserver;















import android.os.FileUtils;















import android.os.Handler;















import android.os.IBinder;










@@ -365,6 +365,7 @@ import android.provider.Downloads;













import android.provider.Settings;















import android.service.voice.IVoiceInteractionSession;















import android.service.voice.VoiceInteractionManagerInternal;













import android.sysprop.DisplayProperties;















import android.sysprop.VoldProperties;















import android.telecom.TelecomManager;















import android.text.TextUtils;










@@ -416,12 +417,12 @@ import com.android.internal.notification.SystemNotificationChannels;













import com.android.internal.os.BackgroundThread;















import com.android.internal.os.BatteryStatsImpl;















import com.android.internal.os.BinderInternal;













import com.android.internal.os.logging.MetricsLoggerWrapper;















import com.android.internal.os.ByteTransferPipe;















import com.android.internal.os.IResultReceiver;















import com.android.internal.os.ProcessCpuTracker;















import com.android.internal.os.TransferPipe;















import com.android.internal.os.Zygote;













import com.android.internal.os.logging.MetricsLoggerWrapper;















import com.android.internal.policy.IKeyguardDismissCallback;















import com.android.internal.policy.KeyguardDismissCallback;















import com.android.internal.telephony.TelephonyIntents;









@@ -448,17 +449,16 @@ import com.android.server.SystemService;













import com.android.server.SystemServiceManager;















import com.android.server.ThreadPriorityBooster;















import com.android.server.Watchdog;













import com.android.server.am.ActivityStack.ActivityState;













import com.android.server.am.MemoryStatUtil.MemoryStat;













import com.android.server.am.ActivityManagerServiceProto;















import com.android.server.am.ActivityManagerServiceDumpActivitiesProto;















import com.android.server.am.ActivityManagerServiceDumpBroadcastsProto;















import com.android.server.am.ActivityManagerServiceDumpProcessesProto;















import com.android.server.am.ActivityManagerServiceDumpProcessesProto.UidObserverRegistrationProto;















import com.android.server.am.ActivityManagerServiceDumpServicesProto;













import com.android.server.am.ActivityStack.ActivityState;















import com.android.server.am.GrantUriProto;















import com.android.server.am.ImportanceTokenProto;















import com.android.server.am.MemInfoDumpProto;













import com.android.server.am.MemoryStatUtil.MemoryStat;















import com.android.server.am.NeededUriGrantsProto;















import com.android.server.am.ProcessOomProto;















import com.android.server.am.ProcessToGcProto;









@@ -475,12 +475,12 @@ import com.android.server.wm.WindowManagerService;



























import dalvik.system.VMRuntime;



























import libcore.io.IoUtils;













import libcore.util.EmptyArray;



























import com.google.android.collect.Lists;















import com.google.android.collect.Maps;



























import libcore.io.IoUtils;













import libcore.util.EmptyArray;



























import org.xmlpull.v1.XmlPullParser;















import org.xmlpull.v1.XmlPullParserException;















import org.xmlpull.v1.XmlSerializer;










@@ -14949,8 +14949,8 @@ public class ActivityManagerService extends IActivityManager.Stub













                mContext.getPackageManager().hasSystemFeature(FEATURE_LEANBACK_ONLY);















        mHiddenApiBlacklist.registerObserver();



























        // Transfer any global setting for forcing RTL layout, into a System Property













        SystemProperties.set(DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0");













        // Transfer any global setting for forcing RTL layout, into a Display Property













        DisplayProperties.debug_force_rtl(forceRtl);





























        final Configuration configuration = new Configuration();















        Settings.System.getConfiguration(resolver, configuration);