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

Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev

Browse Source
This commit is contained in:
Amith Yamasani
2013-09-23 21:14:51 +00:00
committed by Android (Google) Code Review
parent ba0fa9ce5e c2be0d6183
commit 85f77c2b8b
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityManagerNative.java
View File

@@ -152,7 +152,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
int startFlags = data.readInt(); int startFlags = data.readInt();
String profileFile = data.readString(); String profileFile = data.readString();
ParcelFileDescriptor profileFd = data.readInt() != 0 ParcelFileDescriptor profileFd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
Bundle options = data.readInt() != 0 Bundle options = data.readInt() != 0
? Bundle.CREATOR.createFromParcel(data) : null; ? Bundle.CREATOR.createFromParcel(data) : null;
int userId = data.readInt(); int userId = data.readInt();
@@ -178,7 +178,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
int startFlags = data.readInt(); int startFlags = data.readInt();
String profileFile = data.readString(); String profileFile = data.readString();
ParcelFileDescriptor profileFd = data.readInt() != 0 ParcelFileDescriptor profileFd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
Bundle options = data.readInt() != 0 Bundle options = data.readInt() != 0
? Bundle.CREATOR.createFromParcel(data) : null; ? Bundle.CREATOR.createFromParcel(data) : null;
int userId = data.readInt(); int userId = data.readInt();
@@ -1354,7 +1354,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
int profileType = data.readInt(); int profileType = data.readInt();
String path = data.readString(); String path = data.readString();
ParcelFileDescriptor fd = data.readInt() != 0 ParcelFileDescriptor fd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
boolean res = profileControl(process, userId, start, path, fd, profileType); boolean res = profileControl(process, userId, start, path, fd, profileType);
reply.writeNoException(); reply.writeNoException();
reply.writeInt(res ? 1 : 0); reply.writeInt(res ? 1 : 0);
@@ -1608,7 +1608,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
boolean managed = data.readInt() != 0; boolean managed = data.readInt() != 0;
String path = data.readString(); String path = data.readString();
ParcelFileDescriptor fd = data.readInt() != 0 ParcelFileDescriptor fd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
boolean res = dumpHeap(process, userId, managed, path, fd); boolean res = dumpHeap(process, userId, managed, path, fd);
reply.writeNoException(); reply.writeNoException();
reply.writeInt(res ? 1 : 0); reply.writeInt(res ? 1 : 0);

8
core/java/android/app/ApplicationThreadNative.java
View File

@@ -143,7 +143,7 @@ public abstract class ApplicationThreadNative extends Binder
boolean isForward = data.readInt() != 0; boolean isForward = data.readInt() != 0;
String profileName = data.readString(); String profileName = data.readString();
ParcelFileDescriptor profileFd = data.readInt() != 0 ParcelFileDescriptor profileFd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
boolean autoStopProfiler = data.readInt() != 0; boolean autoStopProfiler = data.readInt() != 0;
scheduleLaunchActivity(intent, b, ident, info, curConfig, compatInfo, procState, state, scheduleLaunchActivity(intent, b, ident, info, curConfig, compatInfo, procState, state,
ri, pi, notResumed, isForward, profileName, profileFd, autoStopProfiler); ri, pi, notResumed, isForward, profileName, profileFd, autoStopProfiler);
@@ -267,7 +267,7 @@ public abstract class ApplicationThreadNative extends Binder
? new ComponentName(data) : null; ? new ComponentName(data) : null;
String profileName = data.readString(); String profileName = data.readString();
ParcelFileDescriptor profileFd = data.readInt() != 0 ParcelFileDescriptor profileFd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
boolean autoStopProfiler = data.readInt() != 0; boolean autoStopProfiler = data.readInt() != 0;
Bundle testArgs = data.readBundle(); Bundle testArgs = data.readBundle();
IBinder binder = data.readStrongBinder(); IBinder binder = data.readStrongBinder();
@@ -418,7 +418,7 @@ public abstract class ApplicationThreadNative extends Binder
int profileType = data.readInt(); int profileType = data.readInt();
String path = data.readString(); String path = data.readString();
ParcelFileDescriptor fd = data.readInt() != 0 ParcelFileDescriptor fd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
profilerControl(start, path, fd, profileType); profilerControl(start, path, fd, profileType);
return true; return true;
} }
@@ -473,7 +473,7 @@ public abstract class ApplicationThreadNative extends Binder
boolean managed = data.readInt() != 0; boolean managed = data.readInt() != 0;
String path = data.readString(); String path = data.readString();
ParcelFileDescriptor fd = data.readInt() != 0 ParcelFileDescriptor fd = data.readInt() != 0
? data.readFileDescriptor() : null; ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
dumpHeap(managed, path, fd); dumpHeap(managed, path, fd);
return true; return true;
} }

5
core/java/android/preference/PreferenceActivity.java
View File

@@ -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 * 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 be attached to this activity. The default implementation returns <code>true</code> for
* to Key Lime Pie, <code>false</code> otherwise. * 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. * @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. * @return true if the fragment class name is valid for this Activity and false otherwise.
*/ */