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

Commit d94c31d1 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 32a2775e: am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting... 

am 32a2775e: am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev

* commit '32a2775e':
  Unmarshall PFDs properly when hand-crafting interface stubs
parents 4ba9c875 32a2775e

core/java/android/app/ActivityManagerNative.java

+4 −4
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            int startFlags = data.readInt();

            String profileFile = data.readString();

            ParcelFileDescriptor profileFd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            Bundle options = data.readInt() != 0

                    ? Bundle.CREATOR.createFromParcel(data) : null;

            int userId = data.readInt();
@@ -178,7 +178,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            int startFlags = data.readInt();

            String profileFile = data.readString();

            ParcelFileDescriptor profileFd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            Bundle options = data.readInt() != 0

                    ? Bundle.CREATOR.createFromParcel(data) : null;

            int userId = data.readInt();
@@ -1354,7 +1354,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            int profileType = data.readInt();

            String path = data.readString();

            ParcelFileDescriptor fd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            boolean res = profileControl(process, userId, start, path, fd, profileType);

            reply.writeNoException();

            reply.writeInt(res ? 1 : 0);
@@ -1608,7 +1608,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            boolean managed = data.readInt() != 0;

            String path = data.readString();

            ParcelFileDescriptor fd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            boolean res = dumpHeap(process, userId, managed, path, fd);

            reply.writeNoException();

            reply.writeInt(res ? 1 : 0);

core/java/android/app/ApplicationThreadNative.java

+4 −4
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public abstract class ApplicationThreadNative extends Binder 
            boolean isForward = data.readInt() != 0;

            String profileName = data.readString();

            ParcelFileDescriptor profileFd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            boolean autoStopProfiler = data.readInt() != 0;

            scheduleLaunchActivity(intent, b, ident, info, curConfig, compatInfo, procState, state,

                    ri, pi, notResumed, isForward, profileName, profileFd, autoStopProfiler);
@@ -267,7 +267,7 @@ public abstract class ApplicationThreadNative extends Binder 
                ? new ComponentName(data) : null;

            String profileName = data.readString();

            ParcelFileDescriptor profileFd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            boolean autoStopProfiler = data.readInt() != 0;

            Bundle testArgs = data.readBundle();

            IBinder binder = data.readStrongBinder();
@@ -418,7 +418,7 @@ public abstract class ApplicationThreadNative extends Binder 
            int profileType = data.readInt();

            String path = data.readString();

            ParcelFileDescriptor fd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            profilerControl(start, path, fd, profileType);

            return true;

        }
@@ -473,7 +473,7 @@ public abstract class ApplicationThreadNative extends Binder 
            boolean managed = data.readInt() != 0;

            String path = data.readString();

            ParcelFileDescriptor fd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

                    ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;

            dumpHeap(managed, path, fd);

            return true;

        }

core/java/android/preference/PreferenceActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -887,8 +887,9 @@ public abstract class PreferenceActivity extends ListActivity implements 


    /**

     * Subclasses should override this method and verify that the given fragment is a valid type

     * to be attached to this activity. The default implementation returns <code>true</code> prior

     * to Key Lime Pie, <code>false</code> otherwise.

     * to be attached to this activity. The default implementation returns <code>true</code> for

     * apps built for <code>android:targetSdkVersion</code> older than

     * {@link android.os.Build.VERSION_CODES#KITKAT}. For later versions, it will throw an exception.

     * @param fragmentName the class name of the Fragment about to be attached to this activity.

     * @return true if the fragment class name is valid for this Activity and false otherwise.

     */