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

Commit 96623fce authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat

parents 74eaf433 6b94d503

core/java/android/app/ActivityManagerNative.java

+3 −2
Original line number Diff line number Diff line
@@ -1959,7 +1959,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            int initialPid = data.readInt();

            String packageName = data.readString();

            String message = data.readString();

            crashApplication(uid, initialPid, packageName, message);

            crashApplication(uid, initialPid, packageName, message,

                    false /*force*/);

            reply.writeNoException();

            return true;

        }
@@ -5523,7 +5524,7 @@ class ActivityManagerProxy implements IActivityManager 
    }



    public void crashApplication(int uid, int initialPid, String packageName,

            String message) throws RemoteException {

            String message, boolean force) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

core/java/android/app/IActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ public interface IActivityManager extends IInterface { 
    public boolean isTopOfTask(IBinder token) throws RemoteException;



    public void crashApplication(int uid, int initialPid, String packageName,

            String message) throws RemoteException;

            String message, boolean force) throws RemoteException;



    public String getProviderMimeType(Uri uri, int userId) throws RemoteException;

packages/SystemUI/src/com/android/systemui/ImageWallpaper.java

+10 −1
Original line number Diff line number Diff line
@@ -578,7 +578,16 @@ public class ImageWallpaper extends WallpaperService { 


            final FloatBuffer triangleVertices = createMesh(left, top, right, bottom);



            final int texture = loadTexture(mBackground);

            int texture = 0;

            try {

                texture = loadTexture(mBackground);

            } catch (IllegalArgumentException e) {

                mEgl.eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);

                mEgl.eglDestroySurface(mEglDisplay, mEglSurface);

                mEgl.eglDestroyContext(mEglDisplay, mEglContext);

                mEgl.eglTerminate(mEglDisplay);

                return false;

            }

            final int program = buildProgram(sSimpleVS, sSimpleFS);



            final int attribPosition = glGetAttribLocation(program, "position");

services/core/java/com/android/server/am/ActiveServices.java

+9 −0
Original line number Diff line number Diff line
@@ -618,6 +618,15 @@ public final class ActiveServices { 
        }

    }



    void killMisbehavingService(ServiceRecord r,

            int appUid, int appPid, String localPackageName) {

        synchronized (mAm) {

            stopServiceLocked(r);

            mAm.crashApplication(appUid, appPid, localPackageName,

                    "Bad notification for startForeground", true /*force*/);

        }

    }



    IBinder peekServiceLocked(Intent service, String resolvedType, String callingPackage) {

        ServiceLookupResult r = retrieveServiceLocked(service, resolvedType, callingPackage,

                Binder.getCallingPid(), Binder.getCallingUid(),

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -5122,7 +5122,7 @@ public final class ActivityManagerService extends ActivityManagerNative 














    @Override















    public void crashApplication(int uid, int initialPid, String packageName,













            String message) {













            String message, boolean force) {















        if (checkCallingPermission(android.Manifest.permission.FORCE_STOP_PACKAGES)















                != PackageManager.PERMISSION_GRANTED) {















            String msg = "Permission Denial: crashApplication() from pid="









@@ -5134,7 +5134,8 @@ public final class ActivityManagerService extends ActivityManagerNative













        }





























        synchronized(this) {













            mAppErrors.scheduleAppCrashLocked(uid, initialPid, packageName, message);













            mAppErrors.scheduleAppCrashLocked(uid, initialPid, packageName,













                    message, force);















        }















    }