diff options
| author | 2015-01-05 23:16:42 +0000 | |
|---|---|---|
| committer | 2015-01-05 23:16:42 +0000 | |
| commit | 5f86b66c9bd9276f31255fc372631e532dd5d974 (patch) | |
| tree | e1b8cb06e3c1e98a0ef7affec450fb666a89945d | |
| parent | 2b37034c5723da3915612b77ee6949b22eeb95bf (diff) | |
| parent | d17218e7df24da8a2bcf6e7714dc0151155c3286 (diff) | |
am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev
automerge: d17218e
* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
Fix issue #18901214: APR: Frequent crash in android
| -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 8b7bdd6b6d75..085cc81f7d21 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3057,8 +3057,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" /> |