From bad80e0dccdeaeea97991f7d092678ff0df1bc84 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 30 Jul 2009 01:21:08 -0700 Subject: [PATCH] Add Activity Intent.ACTION_REQUEST_SHUTDOWN for requesting a system shutdown. The Intent.EXTRA_KEY_CONFIRM extra can be set to require user confirmation before shutting down. The ACTION_REQUEST_SHUTDOWN Intent is protected by android.permission.SHUTDOWN. Signed-off-by: Mike Lockwood --- core/java/android/content/Intent.java | 19 ++++++++ core/res/AndroidManifest.xml | 10 ++++ .../com/android/server/ShutdownActivity.java | 46 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 services/java/com/android/server/ShutdownActivity.java diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 5c75e2d6003b4..f9b082fecadf4 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1408,6 +1408,17 @@ public class Intent implements Parcelable { */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_SHUTDOWN = "android.intent.action.ACTION_SHUTDOWN"; + /** + * Activity Action: Start this activity to request system shutdown. + * The optional boolean extra field {@link #EXTRA_KEY_CONFIRM} can be set to true + * to request confirmation from the user before shutting down. + * + *

This is a protected intent that can only be sent + * by the system. + * + * {@hide} + */ + public static final String ACTION_REQUEST_SHUTDOWN = "android.intent.action.ACTION_REQUEST_SHUTDOWN"; /** * Broadcast Action: Indicates low memory condition on the device * @@ -1892,6 +1903,14 @@ public class Intent implements Parcelable { */ public static final String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT"; + /** + * Set to true in {@link #ACTION_REQUEST_SHUTDOWN} to request confirmation from the user + * before shutting down. + * + * {@hide} + */ + public static final String EXTRA_KEY_CONFIRM = "android.intent.extra.KEY_CONFIRM"; + /** * Used as an boolean extra field in {@link android.content.Intent#ACTION_PACKAGE_REMOVED} or * {@link android.content.Intent#ACTION_PACKAGE_CHANGED} intents to override the default action diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 1cd04f1c91842..5f94ee55f7dd2 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1130,6 +1130,16 @@ android:exported="true"> + + + + + + + diff --git a/services/java/com/android/server/ShutdownActivity.java b/services/java/com/android/server/ShutdownActivity.java new file mode 100644 index 0000000000000..7f0e90dad5693 --- /dev/null +++ b/services/java/com/android/server/ShutdownActivity.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server; + +import android.app.Activity; +import android.content.BroadcastReceiver; +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.util.Log; +import com.android.internal.app.ShutdownThread; + +public class ShutdownActivity extends Activity { + + private static final String TAG = "ShutdownActivity"; + private boolean mConfirm; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mConfirm = getIntent().getBooleanExtra(Intent.EXTRA_KEY_CONFIRM, false); + Log.i(TAG, "onCreate(): confirm=" + mConfirm); + + Handler h = new Handler(); + h.post(new Runnable() { + public void run() { + ShutdownThread.shutdown(ShutdownActivity.this, mConfirm); + } + }); + } +}