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

Commit 9ecebbfb authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Add mechanism for Parcel to not allow FDs to be written to it. 

This is to help implement issue #5224703.

Change-Id: I026a5890495537d15b57fe61227a640aac806d46
parent 8ebf1efd

core/java/android/app/Activity.java

+7 −0
Original line number Diff line number Diff line
@@ -3246,6 +3246,7 @@ public class Activity extends ContextThemeWrapper 
        try {

            String resolvedType = null;

            if (fillInIntent != null) {

                fillInIntent.setAllowFds(false);

                resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());

            }

            int result = ActivityManagerNative.getDefault()
@@ -3370,6 +3371,7 @@ public class Activity extends ContextThemeWrapper 
        if (mParent == null) {

            int result = IActivityManager.START_RETURN_INTENT_TO_CALLER;

            try {

                intent.setAllowFds(false);

                result = ActivityManagerNative.getDefault()

                    .startActivity(mMainThread.getApplicationThread(),

                            intent, intent.resolveTypeIfNeeded(
@@ -3419,6 +3421,7 @@ public class Activity extends ContextThemeWrapper 
    public boolean startNextMatchingActivity(Intent intent) {

        if (mParent == null) {

            try {

                intent.setAllowFds(false);

                return ActivityManagerNative.getDefault()

                    .startNextMatchingActivity(mToken, intent);

            } catch (RemoteException e) {
@@ -3692,6 +3695,9 @@ public class Activity extends ContextThemeWrapper 
            }

            if (false) Log.v(TAG, "Finishing self: token=" + mToken);

            try {

                if (resultData != null) {

                    resultData.setAllowFds(false);

                }

                if (ActivityManagerNative.getDefault()

                    .finishActivity(mToken, resultCode, resultData)) {

                    mFinished = true;
@@ -3812,6 +3818,7 @@ public class Activity extends ContextThemeWrapper 
            int flags) {

        String packageName = getPackageName();

        try {

            data.setAllowFds(false);

            IIntentSender target =

                ActivityManagerNative.getDefault().getIntentSender(

                        IActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName,

core/java/android/app/ActivityThread.java

+3 −0
Original line number Diff line number Diff line
@@ -2674,6 +2674,7 @@ public final class ActivityThread { 
            // Next have the activity save its current state and managed dialogs...

            if (!r.activity.mFinished && saveState) {

                state = new Bundle();

                state.setAllowFds(false);

                mInstrumentation.callActivityOnSaveInstanceState(r.activity, state);

                r.state = state;

            }
@@ -2775,6 +2776,7 @@ public final class ActivityThread { 
            if (!r.activity.mFinished && saveState) {

                if (r.state == null) {

                    state = new Bundle();

                    state.setAllowFds(false);

                    mInstrumentation.callActivityOnSaveInstanceState(r.activity, state);

                    r.state = state;

                } else {
@@ -3306,6 +3308,7 @@ public final class ActivityThread { 
        }

        if (r.state == null && !r.stopped && !r.isPreHoneycomb()) {

            r.state = new Bundle();

            r.state.setAllowFds(false);

            mInstrumentation.callActivityOnSaveInstanceState(r.activity, r.state);

        }

core/java/android/app/ContextImpl.java

+14 −0
Original line number Diff line number Diff line
@@ -874,6 +874,7 @@ class ContextImpl extends Context { 
        try {

            String resolvedType = null;

            if (fillInIntent != null) {

                fillInIntent.setAllowFds(false);

                resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());

            }

            int result = ActivityManagerNative.getDefault()
@@ -892,6 +893,7 @@ class ContextImpl extends Context { 
    public void sendBroadcast(Intent intent) {

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, false, false);
@@ -903,6 +905,7 @@ class ContextImpl extends Context { 
    public void sendBroadcast(Intent intent, String receiverPermission) {

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, receiverPermission, false, false);
@@ -915,6 +918,7 @@ class ContextImpl extends Context { 
            String receiverPermission) {

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, receiverPermission, true, false);
@@ -946,6 +950,7 @@ class ContextImpl extends Context { 
        }

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, receiverPermission,
@@ -958,6 +963,7 @@ class ContextImpl extends Context { 
    public void sendStickyBroadcast(Intent intent) {

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, false, true);
@@ -989,6 +995,7 @@ class ContextImpl extends Context { 
        }

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, null,
@@ -1005,6 +1012,7 @@ class ContextImpl extends Context { 
            intent.setDataAndType(intent.getData(), resolvedType);

        }

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().unbroadcastIntent(

                mMainThread.getApplicationThread(), intent);

        } catch (RemoteException e) {
@@ -1069,6 +1077,7 @@ class ContextImpl extends Context { 
    @Override

    public ComponentName startService(Intent service) {

        try {

            service.setAllowFds(false);

            ComponentName cn = ActivityManagerNative.getDefault().startService(

                mMainThread.getApplicationThread(), service,

                service.resolveTypeIfNeeded(getContentResolver()));
@@ -1086,6 +1095,7 @@ class ContextImpl extends Context { 
    @Override

    public boolean stopService(Intent service) {

        try {

            service.setAllowFds(false);

            int res = ActivityManagerNative.getDefault().stopService(

                mMainThread.getApplicationThread(), service,

                service.resolveTypeIfNeeded(getContentResolver()));
@@ -1116,6 +1126,7 @@ class ContextImpl extends Context { 
                    < android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {

                flags |= BIND_WAIVE_PRIORITY;

            }

            service.setAllowFds(false);

            int res = ActivityManagerNative.getDefault().bindService(

                mMainThread.getApplicationThread(), getActivityToken(),

                service, service.resolveTypeIfNeeded(getContentResolver()),
@@ -1148,6 +1159,9 @@ class ContextImpl extends Context { 
    public boolean startInstrumentation(ComponentName className,

            String profileFile, Bundle arguments) {

        try {

            if (arguments != null) {

                arguments.setAllowFds(false);

            }

            return ActivityManagerNative.getDefault().startInstrumentation(

                    className, profileFile, 0, arguments, null);

        } catch (RemoteException e) {

core/java/android/app/Instrumentation.java

+3 −0
Original line number Diff line number Diff line
@@ -1375,6 +1375,7 @@ public class Instrumentation { 
            }

        }

        try {

            intent.setAllowFds(false);

            int result = ActivityManagerNative.getDefault()

                .startActivity(whoThread, intent,

                        intent.resolveTypeIfNeeded(who.getContentResolver()),
@@ -1415,6 +1416,7 @@ public class Instrumentation { 
        try {

            String[] resolvedTypes = new String[intents.length];

            for (int i=0; i<intents.length; i++) {

                intents[i].setAllowFds(false);

                resolvedTypes[i] = intents[i].resolveTypeIfNeeded(who.getContentResolver());

            }

            int result = ActivityManagerNative.getDefault()
@@ -1471,6 +1473,7 @@ public class Instrumentation { 
            }

        }

        try {

            intent.setAllowFds(false);

            int result = ActivityManagerNative.getDefault()

                .startActivity(whoThread, intent,

                        intent.resolveTypeIfNeeded(who.getContentResolver()),

core/java/android/app/LoadedApk.java

+3 −0
Original line number Diff line number Diff line
@@ -661,6 +661,9 @@ public final class LoadedApk { 
                            "Finishing broadcast to unregistered receiver");

                    IActivityManager mgr = ActivityManagerNative.getDefault();

                    try {

                        if (extras != null) {

                            extras.setAllowFds(false);

                        }

                        mgr.finishReceiver(this, resultCode, data, extras, false);

                    } catch (RemoteException e) {

                        Slog.w(ActivityThread.TAG, "Couldn't finish broadcast to unregistered receiver");