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

Commit e0275cd9 authored by Daniel Zheng's avatar Daniel Zheng Committed by Android (Google) Code Review
Browse files

Merge "update screenPartStatus to return a list" into main

parents 1c1baa7e ea86ce85

core/java/android/os/ITradeInMode.aidl

+1 −1
Original line number Diff line number Diff line
@@ -131,5 +131,5 @@ interface ITradeInMode { 
     * Get ScreenPartStatus

     *

     */

    ScreenPartStatus getScreenPartStatus();

    ScreenPartStatus[] getScreenPartStatus();

}

services/core/java/com/android/server/TradeInModeService.java

+7 −6
Original line number Diff line number Diff line
@@ -252,16 +252,17 @@ public final class TradeInModeService extends SystemService { 


        @Override

        @RequiresPermission(android.Manifest.permission.ENTER_TRADE_IN_MODE)

        public int getScreenPartStatus() throws RemoteException {

            SurfaceControl b = new SurfaceControl.Builder().setName("TIM").build();

        public int[] getScreenPartStatus() throws RemoteException {

            int[] statuses = new int[DisplayControl.getPhysicalDisplayIds().length];

            int index = 0;

            // loop through all displayId to find id of internal display

            for (long physicalDisplayId : DisplayControl.getPhysicalDisplayIds()) {

                SurfaceControl.StaticDisplayInfo info = b.getStaticDisplayInfo(physicalDisplayId);

                if (info.isInternal) {

                    return info.screenPartStatus;

                SurfaceControl.StaticDisplayInfo info = SurfaceControl.getStaticDisplayInfo(physicalDisplayId);

                if (info != null && info.isInternal) {

                    statuses[index++] = info.screenPartStatus;

                }

            }

            return 0;

            return statuses;

        }



        @Override