Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-01-05 23:03:46 +00:00
committed by Android (Google) Code Review
parent 8c6b59f46d b182955a1e
commit 2980719512
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/ShutdownActivity.java → core/java/com/android/internal/app/ShutdownActivity.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.server; package com.android.internal.app;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;

3
core/res/AndroidManifest.xml
View File

@@ -3028,8 +3028,9 @@
android:process=":ui"> android:process=":ui">
</activity> </activity>
<activity android:name="com.android.server.ShutdownActivity" <activity android:name="com.android.internal.app.ShutdownActivity"
android:permission="android.permission.SHUTDOWN" android:permission="android.permission.SHUTDOWN"
android:theme="@style/Theme.NoDisplay"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.ACTION_REQUEST_SHUTDOWN" /> <action android:name="android.intent.action.ACTION_REQUEST_SHUTDOWN" />