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

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

Browse Source 
* commit '298071951210ae23c8023c4dc8f82da5d1760211':
  Fix issue #18901214: APR: Frequent crash in android
This commit is contained in:
Dianne Hackborn
2015-01-05 23:09:07 +00:00
committed by Android Git Automerger
parent 8117eda6f1 2980719512
commit 24bc8d761a
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.
*/
package com.android.server;
package com.android.internal.app;
import android.app.Activity;
import android.content.Context;

3
core/res/AndroidManifest.xml
View File

@@ -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" />