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

Commit 506ba086 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "QuickBoot: rename some intents and broadcasts"

parents f77e426c 3489746f

policy/src/com/android/internal/policy/impl/GlobalActions.java

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 


    private void startQuickBoot() {



        Intent intent = new Intent("qualcomm.intent.action.QUICKBOOT");

        Intent intent = new Intent("org.codeaurora.action.QUICKBOOT");

        intent.putExtra("mode", 0);

        try {

            mContext.startActivityAsUser(intent,UserHandle.CURRENT);

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3888,7 +3888,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


        public void run() {



            Intent intent = new Intent("qualcomm.intent.action.QUICKBOOT");

            Intent intent = new Intent("org.codeaurora.action.QUICKBOOT");

            intent.putExtra("mode", 1);

            try {

                mContext.startActivityAsUser(intent,UserHandle.CURRENT);
@@ -3908,7 +3908,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

            };



            IntentFilter filter = new IntentFilter("qualcomm.intent.QUICKBOOT.START");

            IntentFilter filter = new IntentFilter("org.codeaurora.quickboot.poweron_start");

            mContext.registerReceiver(broadcastReceiver,filter,

                    "android.permission.DEVICE_POWER",null);

services/java/com/android/server/AlarmManagerService.java

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 The Android Open Source Project

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -1458,7 +1458,7 @@ class AlarmManagerService extends IAlarmManager.Stub { 


        public QuickBootReceiver() {

            IntentFilter filter = new IntentFilter();

            filter.addAction("intent.quickboot.appkilled");

            filter.addAction("org.codeaurora.quickboot.appkilled");

            mContext.registerReceiver(this, filter,

                    "android.permission.DEVICE_POWER", null);

        }
@@ -1467,7 +1467,7 @@ class AlarmManagerService extends IAlarmManager.Stub { 
            public void onReceive(Context context, Intent intent) {

                String action = intent.getAction();

                String pkgList[] = null;

                if ("intent.quickboot.appkilled".equals(action)) {

                if ("org.codeaurora.quickboot.appkilled".equals(action)) {

                    pkgList = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);

                    if (pkgList != null && (pkgList.length > 0)) {

                        for (String pkg : pkgList) {

services/java/com/android/server/wm/WindowManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -5393,7 +5393,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    }



    private void checkQuickBootException() {

        Intent intent = new Intent("qualcomm.intent.action.QUICKBOOT");

        Intent intent = new Intent("org.codeaurora.action.QUICKBOOT");

        intent.putExtra("mode", 2);

        try {

            mContext.startActivityAsUser(intent,UserHandle.CURRENT);