diff options
| -rw-r--r-- | core/java/com/android/internal/app/ShutdownActivity.java (renamed from services/core/java/com/android/server/ShutdownActivity.java) | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/ShutdownActivity.java b/core/java/com/android/internal/app/ShutdownActivity.java index 56172ed05f1d..97521cf68dd4 100644 --- a/services/core/java/com/android/server/ShutdownActivity.java +++ b/core/java/com/android/internal/app/ShutdownActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.internal.app; import android.app.Activity; import android.content.Context; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 87b99712633e..ccdb5db3d647 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3028,8 +3028,9 @@ android:process=":ui"> </activity> - <activity android:name="com.android.server.ShutdownActivity" + <activity android:name="com.android.internal.app.ShutdownActivity" android:permission="android.permission.SHUTDOWN" + android:theme="@style/Theme.NoDisplay" android:excludeFromRecents="true"> <intent-filter> <action android:name="android.intent.action.ACTION_REQUEST_SHUTDOWN" /> |