Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24bc8d76 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

* commit '29807195':
  Fix issue #18901214: APR: Frequent crash in android
parents 8117eda6 29807195

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />