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

Commit 64a16be2 authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev

parents 32a16bad b189aa6c

services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -533,6 +533,8 @@ public class RetailDemoModeService extends SystemService { 




        SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");

        SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");

        mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);

        mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);



        registerBroadcastReceiver();

    }

    }





    @Override

    @Override
@@ -568,7 +570,6 @@ public class RetailDemoModeService extends SystemService { 
            case PHASE_BOOT_COMPLETED:

            case PHASE_BOOT_COMPLETED:

                if (UserManager.isDeviceInDemoMode(getContext())) {

                if (UserManager.isDeviceInDemoMode(getContext())) {

                    putDeviceInDemoMode();

                    putDeviceInDemoMode();

                    registerBroadcastReceiver();

                }

                }

                break;

                break;

        }

        }